From e49ce898ad278576ba1b981c424604ba0fbbe20d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 Mar 2025 10:06:01 +0000 Subject: [PATCH 1/4] Bump pytest from 8.3.4 to 8.3.5 in /test Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.4 to 8.3.5. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.3.4...8.3.5) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/requirements.txt b/test/requirements.txt index 16f822d..57384cd 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -1,4 +1,4 @@ -pytest == 8.3.4 +pytest == 8.3.5 pytest-xdist == 3.6.1 pytest-testinfra == 10.1.1 black == 25.1.0 From ae82aad4e473f57185a34e8aed081178eee37417 Mon Sep 17 00:00:00 2001 From: casperklein Date: Sat, 15 Mar 2025 04:09:08 +0100 Subject: [PATCH 2/4] add bash-completion package Signed-off-by: casperklein --- src/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Dockerfile b/src/Dockerfile index a0bbe37..282b400 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -19,6 +19,7 @@ ENV FTL_CMD=no-daemon RUN apk add --no-cache \ bash \ + bash-completion \ bind-tools \ binutils \ coreutils \ From aeb5e71f26338bfe2d2233fc333a61b85c41fa16 Mon Sep 17 00:00:00 2001 From: Michael Woolweaver Date: Sat, 15 Mar 2025 10:59:20 -0500 Subject: [PATCH 3/4] Set day of week for gravity update to be the same as bare metal install Signed-off-by: Michael Woolweaver --- src/crontab.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crontab.txt b/src/crontab.txt index 5d7453a..42d1668 100644 --- a/src/crontab.txt +++ b/src/crontab.txt @@ -1,3 +1,3 @@ -59 1 * * 6 PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updateGravity >/var/log/pihole/pihole_updateGravity.log || cat /var/log/pihole/pihole_updateGravity.log +59 1 * * 7 PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updateGravity >/var/log/pihole/pihole_updateGravity.log || cat /var/log/pihole/pihole_updateGravity.log 00 00 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole flush once quiet 59 17 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker From 0d241ef7a8e6fd15661cf757ed0fcc23154a46be Mon Sep 17 00:00:00 2001 From: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com> Date: Mon, 24 Mar 2025 19:58:59 +0100 Subject: [PATCH 4/4] Add a test to check if running a old version of docker Signed-off-by: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com> --- src/start.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/start.sh b/src/start.sh index e95c380..cc17ce9 100644 --- a/src/start.sh +++ b/src/start.sh @@ -1,5 +1,10 @@ #!/bin/bash +if [ ! -x /bin/sh ]; then + echo "Executable test for /bin/sh failed. Your Docker version is too old to run Alpine 3.14+ and Pi-hole. You must upgrade Docker."; + exit 1; +fi + if [ "${PH_VERBOSE:-0}" -gt 0 ]; then set -x fi