Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2026-05-08 09:48:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

new pihole dev

Browse Source
This commit is contained in:
Adam Hill
2019-01-01 13:51:33 -06:00
parent 26e1c82fd0
commit d9ca4187b9
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile_aarch64
+2 -2
View File
@@ -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"
Dockerfile_armel
+2 -2
View File
@@ -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"
Dockerfile_armhf
+2 -2
View File
@@ -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"
deploy_docker.sh
+1 -1
View File
@@ -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
s6/debian-root/etc/services.d/pihole-FTL/run
+2 -1
View File
@@ -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