diff --git a/Dockerfile_aarch64 b/Dockerfile_aarch64 index 2d96b5f..b8b0239 100644 --- a/Dockerfile_aarch64 +++ b/Dockerfile_aarch64 @@ -31,11 +31,11 @@ ENV S6_KEEP_ENV 1 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 ENV FTL_CMD debug -ENV VERSION v4.1 +ENV VERSION v4.1.1 ENV ARCH aarch64 ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.1_aarch64" +LABEL image="pihole/pihole:v4.1.1_aarch64" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/Dockerfile_armel b/Dockerfile_armel index 4f746b1..d6be046 100644 --- a/Dockerfile_armel +++ b/Dockerfile_armel @@ -31,11 +31,11 @@ ENV S6_KEEP_ENV 1 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 ENV FTL_CMD debug -ENV VERSION v4.1 +ENV VERSION v4.1.1 ENV ARCH armel ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.1_armel" +LABEL image="pihole/pihole:v4.1.1_armel" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/Dockerfile_armhf b/Dockerfile_armhf index 037e68a..806783a 100644 --- a/Dockerfile_armhf +++ b/Dockerfile_armhf @@ -31,11 +31,11 @@ ENV S6_KEEP_ENV 1 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2 ENV FTL_CMD debug -ENV VERSION v4.1 +ENV VERSION v4.1.1 ENV ARCH armhf ENV PATH /opt/pihole:${PATH} -LABEL image="pihole/pihole:v4.1_armhf" +LABEL image="pihole/pihole:v4.1.1_armhf" LABEL maintainer="adam@diginc.us" LABEL url="https://www.github.com/pi-hole/docker-pi-hole" diff --git a/deploy_docker.sh b/deploy_docker.sh index 310a778..dd63e4b 100755 --- a/deploy_docker.sh +++ b/deploy_docker.sh @@ -70,7 +70,7 @@ $dry tox images=() for tag in ${!arch_map[@]}; do # Verison specific tags for ongoing history - $dry docker tag $localimg:v4.1_$tag $remoteimg:${version}_${tag} + $dry docker tag $localimg:v4.1.1_$tag $remoteimg:${version}_${tag} $dry docker push pihole/pihole:${version}_${tag} images+=(pihole/pihole:${version}_${tag}) done diff --git a/s6/debian-root/etc/services.d/pihole-FTL/run b/s6/debian-root/etc/services.d/pihole-FTL/run index 98e9cba..dc0d2c7 100644 --- a/s6/debian-root/etc/services.d/pihole-FTL/run +++ b/s6/debian-root/etc/services.d/pihole-FTL/run @@ -1,5 +1,6 @@ #!/usr/bin/with-contenv bash s6-echo "Starting pihole-FTL ($FTL_CMD)" -s6-setuidgid root pihole-FTL $FTL_CMD +# debug is the current default, but this hammers SD cards so disabling all output other than log files +s6-setuidgid root pihole-FTL $FTL_CMD >/dev/null 2>&1