From a0421789cc08f52e6db93a9ffdefbd40617a51cc Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 27 Nov 2022 22:35:31 +0000 Subject: [PATCH 1/7] CAP_STR will always be empty, since 776bac7b moved the calculation of that variable back out to bash_functions.sh The capabilities are already set there, so they do not need to be set again here. Signed-off-by: Adam Warner --- src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/run | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/run b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/run index 8503538ec..e34a81037 100755 --- a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/run +++ b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/run @@ -38,8 +38,7 @@ if [ ! -f /var/log/pihole-FTL.log ]; then chown -h pihole:pihole /var/log/pihole-FTL.log fi -# Call capsh with the detected capabilities -capsh --inh=${CAP_STR:1} --addamb=${CAP_STR:1} --user=$DNSMASQ_USER --keep=1 -- -c "/usr/bin/pihole-FTL $FTL_CMD >/dev/null 2>&1" +capsh --user=$DNSMASQ_USER --keep=1 -- -c "/usr/bin/pihole-FTL $FTL_CMD >/dev/null 2>&1" # Notes on above: # - DNSMASQ_USER default of pihole is in Dockerfile & can be overwritten by runtime container env From 41ac2b3aa8caa45aa3348347c191f4539b5435b6 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 30 Nov 2022 22:38:31 +0000 Subject: [PATCH 2/7] Update README to explain the version numbers slightly more accurately Signed-off-by: Adam Warner --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 326b0e08c..19c338fbf 100644 --- a/README.md +++ b/README.md @@ -228,11 +228,13 @@ Users of older Ubuntu releases (circa 17.04) will need to disable dnsmasq. The primary docker tags are explained in the following table. [Click here to see the full list of tags](https://store.docker.com/community/images/pihole/pihole/tags). See [GitHub Release notes](https://github.com/pi-hole/docker-pi-hole/releases) to see the specific version of Pi-hole Core, Web, and FTL included in the release. +The Date-based (including incremented "Patch" versions) do not relate to any kind of semantic version number, rather a date is used to differentiate between the new version and the old version, nothing more. Release notes will always contain full details of changes in the container, including changes to core Pi-hole components + | tag | description |---------------------|--------------------------------------------------------------------------------------------------------------------------------------------| | `latest` | Always latest release | -| `2022.04` | Date-based release that can receive bugfix updates | -| `2022.04.1` | A specific image that will not receive updates | +| `2022.04` | Date-based release | +| `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) | From 201303a56a97b190f5f92773468ba448d1bd46e2 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Thu, 26 May 2022 20:42:59 +0100 Subject: [PATCH 3/7] ADD padd.sh to the container root Signed-off-by: Adam Warner --- src/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Dockerfile b/src/Dockerfile index f3d433263..71cee6e6d 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -18,6 +18,10 @@ ENV PHP_ENV_CONFIG /etc/lighttpd/conf-enabled/15-fastcgi-php.conf ARG PHP_ERROR_LOG ENV PHP_ERROR_LOG /var/log/lighttpd/error-pihole.log +# Add PADD to the container, too. +ADD https://raw.githubusercontent.com/pi-hole/PADD/master/padd.sh /padd.sh +RUN chmod +x /padd.sh + # IPv6 disable flag for networks/devices that do not support it ENV IPv6 True From fbef9727c1c76b6b4e01a70f854ca82c90685bf2 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 11 Dec 2022 11:27:54 +0000 Subject: [PATCH 4/7] Update Dockerfile Signed-off-by: Adam Warner --- src/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Dockerfile b/src/Dockerfile index 71cee6e6d..c9f23f844 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -19,7 +19,7 @@ ARG PHP_ERROR_LOG ENV PHP_ERROR_LOG /var/log/lighttpd/error-pihole.log # Add PADD to the container, too. -ADD https://raw.githubusercontent.com/pi-hole/PADD/master/padd.sh /padd.sh +ADD https://install.padd.sh /padd.sh RUN chmod +x /padd.sh # IPv6 disable flag for networks/devices that do not support it From 806829a1b1fe55a259f3de579866408f639ec8b0 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 11 Dec 2022 15:51:43 +0000 Subject: [PATCH 5/7] add padd to .codespellignore. Signed-off-by: Adam Warner --- .codespellignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.codespellignore b/.codespellignore index e69de29bb..5f24e7284 100644 --- a/.codespellignore +++ b/.codespellignore @@ -0,0 +1 @@ +padd From f20a0d448c535f8c796a87ba3f6fc53a6503adbf Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 11 Dec 2022 16:16:29 +0000 Subject: [PATCH 6/7] Add to /usr/local/bin and drop the .sh. Can now be called with `padd` Signed-off-by: Adam Warner --- src/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Dockerfile b/src/Dockerfile index c9f23f844..8a05b55b8 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -19,8 +19,8 @@ ARG PHP_ERROR_LOG ENV PHP_ERROR_LOG /var/log/lighttpd/error-pihole.log # Add PADD to the container, too. -ADD https://install.padd.sh /padd.sh -RUN chmod +x /padd.sh +ADD https://install.padd.sh /usr/local/bin/padd +RUN chmod +x /usr/local/bin/padd # IPv6 disable flag for networks/devices that do not support it ENV IPv6 True From e734f1fbce4f36fcf55781d2abec350beff6d164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Thu, 15 Dec 2022 21:54:27 +0100 Subject: [PATCH 7/7] Add merge conflict workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- .github/workflows/merge-conflict.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/merge-conflict.yml diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.yml new file mode 100644 index 000000000..142b0836f --- /dev/null +++ b/.github/workflows/merge-conflict.yml @@ -0,0 +1,21 @@ +name: "Check for merge conflicts" +on: + # So that PRs touching the same files as the push are updated + push: + # So that the `dirtyLabel` is removed if conflicts are resolve + # We recommend `pull_request_target` so that github secrets are available. + # In `pull_request` we wouldn't be able to change labels of fork PRs + pull_request_target: + types: [synchronize] + +jobs: + main: + runs-on: ubuntu-latest + steps: + - name: Check if PRs are have merge conflicts + uses: eps1lon/actions-label-merge-conflict@v2.1.0 + with: + dirtyLabel: "Merge Conflict" + repoToken: "${{ secrets.GITHUB_TOKEN }}" + commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." + commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."