Skip to content

Commit 1213fc6

Browse files
authored
Merge pull request #1799 from pi-hole/development
Development
2 parents c1c9eec + 89e4a96 commit 1213fc6

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

src/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ ENV FTL_CMD=no-daemon
1919

2020
RUN apk add --no-cache \
2121
bash \
22+
bash-completion \
2223
bind-tools \
2324
binutils \
2425
coreutils \

src/crontab.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
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
1+
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
22
00 00 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole flush once quiet
33
59 17 * * * PATH="$PATH:/usr/sbin:/usr/local/bin/" pihole updatechecker

src/start.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#!/bin/bash
22

3+
if [ ! -x /bin/sh ]; then
4+
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.";
5+
exit 1;
6+
fi
7+
38
if [ "${PH_VERBOSE:-0}" -gt 0 ]; then
49
set -x
510
fi

test/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pytest == 8.3.4
1+
pytest == 8.3.5
22
pytest-xdist == 3.6.1
33
pytest-testinfra == 10.1.1
44
black == 25.1.0

0 commit comments

Comments
 (0)