From 7b823e15f428fee4d1a632528a094cc1722ea437 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jul 2023 10:01:18 +0000 Subject: [PATCH 01/11] Bump docker/build-push-action from 3 to 4 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test-and-build-v6.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-and-build-v6.yml b/.github/workflows/test-and-build-v6.yml index 671f2e8d5..fbf2ea695 100644 --- a/.github/workflows/test-and-build-v6.yml +++ b/.github/workflows/test-and-build-v6.yml @@ -63,7 +63,7 @@ jobs: - name: Build container and push by digest (${{ matrix.registry }}) id: build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: context: ./src/ platforms: ${{ matrix.platform }} From 9cb5f0d5758d5003042eff224868cf30f4fb6d11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Sep 2023 10:12:07 +0000 Subject: [PATCH 02/11] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codespell.yml | 2 +- .github/workflows/stale.yml | 2 +- .github/workflows/sync-back-to-dev.yml | 2 +- .github/workflows/test-and-build-v6.yml | 4 ++-- .github/workflows/test-and-build.yaml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 3239ca5c5..2f6e51908 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Spell-Checking uses: codespell-project/actions-codespell@master diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 9d688b25a..e89a09de2 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3.4.0 + uses: actions/checkout@v4 - name: Remove 'stale' label run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }} env: diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml index 70a5c1ca1..fb0e83148 100644 --- a/.github/workflows/sync-back-to-dev.yml +++ b/.github/workflows/sync-back-to-dev.yml @@ -11,7 +11,7 @@ jobs: name: Syncing branches steps: - name: Checkout - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v4 - name: Opening pull request run: gh pr create -B dev -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal' env: diff --git a/.github/workflows/test-and-build-v6.yml b/.github/workflows/test-and-build-v6.yml index fbf2ea695..b4e8f3745 100644 --- a/.github/workflows/test-and-build-v6.yml +++ b/.github/workflows/test-and-build-v6.yml @@ -29,7 +29,7 @@ jobs: container: edge steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: development-v6 @@ -102,7 +102,7 @@ jobs: - build-and-test steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: development-v6 diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index f9c99bd09..715659b2c 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run Tests run: | echo "Building image to test" @@ -29,11 +29,11 @@ jobs: - name: Checkout if: github.event_name != 'schedule' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout dev branch if we are building nightly if: github.event_name == 'schedule' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: dev - From 993cf95faf39340f65776d6cbfc52ec0331244ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Sep 2023 10:36:23 +0000 Subject: [PATCH 03/11] Bump docker/metadata-action from 4 to 5 Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4 to 5. - [Release notes](https://github.com/docker/metadata-action/releases) - [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md) - [Commits](https://github.com/docker/metadata-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test-and-build-v6.yml | 4 ++-- .github/workflows/test-and-build.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-and-build-v6.yml b/.github/workflows/test-and-build-v6.yml index b4e8f3745..826c0f2a1 100644 --- a/.github/workflows/test-and-build-v6.yml +++ b/.github/workflows/test-and-build-v6.yml @@ -35,7 +35,7 @@ jobs: - name: Docker meta (Docker Hub and GitHub Container Registry) id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: github-token: ${{ secrets.GITHUB_TOKEN }} images: | @@ -125,7 +125,7 @@ jobs: - name: Docker meta (Docker Hub and GitHub Container Registry) id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: github-token: ${{ secrets.GITHUB_TOKEN }} images: | diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index 715659b2c..c0790cb37 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -45,7 +45,7 @@ jobs: - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: github-token: ${{ secrets.GITHUB_TOKEN }} images: | From 6952ce4ab4f5b77ec42b26108faa6abfafaee612 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Sep 2023 10:36:27 +0000 Subject: [PATCH 04/11] Bump docker/login-action from 2 to 3 Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test-and-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index 715659b2c..cadb07384 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -59,13 +59,13 @@ jobs: type=ref,event=tag - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} From 0ec6debbc7f850c613a93c41a8ee685913206e2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Sep 2023 10:36:34 +0000 Subject: [PATCH 05/11] Bump docker/build-push-action from 4 to 5 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test-and-build-v6.yml | 2 +- .github/workflows/test-and-build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-and-build-v6.yml b/.github/workflows/test-and-build-v6.yml index b4e8f3745..bf2fc17b9 100644 --- a/.github/workflows/test-and-build-v6.yml +++ b/.github/workflows/test-and-build-v6.yml @@ -63,7 +63,7 @@ jobs: - name: Build container and push by digest (${{ matrix.registry }}) id: build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: ./src/ platforms: ${{ matrix.platform }} diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index 715659b2c..390eade55 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -72,7 +72,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: ./src/ platforms: linux/amd64, linux/arm64, linux/386, linux/arm/v7, linux/arm/v6 From 201f8686467c51ab0d002f8ac6b730a524220018 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Sep 2023 10:36:37 +0000 Subject: [PATCH 06/11] Bump docker/setup-qemu-action from 2 to 3 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test-and-build-v6.yml | 2 +- .github/workflows/test-and-build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-and-build-v6.yml b/.github/workflows/test-and-build-v6.yml index b4e8f3745..b830fb2f5 100644 --- a/.github/workflows/test-and-build-v6.yml +++ b/.github/workflows/test-and-build-v6.yml @@ -55,7 +55,7 @@ jobs: ghcr_password: ${{ secrets.GITHUB_TOKEN }} - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: all - name: Set up Docker Buildx diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index 715659b2c..832f6c9f0 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -38,7 +38,7 @@ jobs: ref: dev - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 883c500e09980b97f1160d37c1f4a6751c4398c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Sep 2023 13:02:03 +0000 Subject: [PATCH 07/11] Bump docker/setup-buildx-action from 2 to 3 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test-and-build-v6.yml | 4 ++-- .github/workflows/test-and-build.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-and-build-v6.yml b/.github/workflows/test-and-build-v6.yml index 156900ccf..881e36707 100644 --- a/.github/workflows/test-and-build-v6.yml +++ b/.github/workflows/test-and-build-v6.yml @@ -59,7 +59,7 @@ jobs: with: platforms: all - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build container and push by digest (${{ matrix.registry }}) id: build @@ -113,7 +113,7 @@ jobs: path: /tmp/digests - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub and GitHub Container Registry uses: ./.github/actions/login-repo diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml index 810a4de5a..1642ef760 100644 --- a/.github/workflows/test-and-build.yaml +++ b/.github/workflows/test-and-build.yaml @@ -41,7 +41,7 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Docker meta id: meta From 9db9fe0e07cb5f1e5c90c57e3b2f846c18d983f9 Mon Sep 17 00:00:00 2001 From: SamTV12345 <40429738+samtv12345@users.noreply.github.com> Date: Sun, 8 Oct 2023 13:56:18 +0200 Subject: [PATCH 08/11] Fixed spellcheck. --- src/s6/debian-root/usr/local/bin/_postFTL.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s6/debian-root/usr/local/bin/_postFTL.sh b/src/s6/debian-root/usr/local/bin/_postFTL.sh index b06cff585..d53fde68f 100755 --- a/src/s6/debian-root/usr/local/bin/_postFTL.sh +++ b/src/s6/debian-root/usr/local/bin/_postFTL.sh @@ -16,7 +16,7 @@ fi if [ -z "$SKIPGRAVITYONBOOT" ] || [ ! -f "${gravityDBfile}" ]; then if [ -n "$SKIPGRAVITYONBOOT" ];then echo " SKIPGRAVITYONBOOT is set, however ${gravityDBfile} does not exist (Likely due to a fresh volume). This is a required file for Pi-hole to operate." - echo " Ignoring SKIPGRAVITYONBOOT on this occaision." + echo " Ignoring SKIPGRAVITYONBOOT on this occasion." fi pihole -g else From 578b4f07b92d7be213834e414c03c659a62a43cc Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 8 Oct 2023 14:14:45 +0100 Subject: [PATCH 09/11] adminLTE->web Signed-off-by: Adam Warner --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 22083e9dd..a194e955e 100644 --- a/README.md +++ b/README.md @@ -235,7 +235,7 @@ The Date-based (including incremented "Patch" versions) do not relate to any kin | `2022.04.1` | Second release in a given month | | `dev` | Similar to `latest`, but for the development branch (pushed occasionally) | | `*beta` | Early beta releases of upcoming versions - here be dragons | -| `nightly` | Like `dev` but pushed every night and pulls from the latest `development` branches of the core Pi-hole components (Pi-hole, AdminLTE, FTL) | +| `nightly` | Like `dev` but pushed every night and pulls from the latest `development` branches of the core Pi-hole components (Pi-hole, web, FTL) | ## Upgrading, Persistence, and Customizations From b2798d44b6c5e8c109e0ff229eca1de8f8b820dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Oct 2023 10:45:52 +0000 Subject: [PATCH 10/11] Bump docker/login-action from 2 to 3 Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/housekeeping.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml index bb6cf5864..439f9372e 100644 --- a/.github/workflows/housekeeping.yml +++ b/.github/workflows/housekeeping.yml @@ -11,7 +11,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Login to GitHub Container Registry with PAT_TOKEN - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} From 062ce990894ce749b8e33795963c591d364ad745 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Oct 2023 10:45:56 +0000 Subject: [PATCH 11/11] Bump docker/setup-buildx-action from 2 to 3 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/housekeeping.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml index bb6cf5864..b6cc7bd9f 100644 --- a/.github/workflows/housekeeping.yml +++ b/.github/workflows/housekeeping.yml @@ -8,7 +8,7 @@ jobs: steps: - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry with PAT_TOKEN uses: docker/login-action@v2