Merge pull request #1799 from pi-hole/development

Development
This commit is contained in:
Adam Warner
2025-03-30 18:25:17 +01:00
committed by GitHub
4 changed files with 8 additions and 2 deletions

View File

@@ -19,6 +19,7 @@ ENV FTL_CMD=no-daemon
RUN apk add --no-cache \ RUN apk add --no-cache \
bash \ bash \
bash-completion \
bind-tools \ bind-tools \
binutils \ binutils \
coreutils \ coreutils \

View File

@@ -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 00 00 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole flush once quiet
59 17 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker 59 17 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker

View File

@@ -1,5 +1,10 @@
#!/bin/bash #!/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 if [ "${PH_VERBOSE:-0}" -gt 0 ]; then
set -x set -x
fi fi

View File

@@ -1,4 +1,4 @@
pytest == 8.3.4 pytest == 8.3.5
pytest-xdist == 3.6.1 pytest-xdist == 3.6.1
pytest-testinfra == 10.1.1 pytest-testinfra == 10.1.1
black == 25.1.0 black == 25.1.0