Merge pull request #258 from diginc/dev

Move FTL_CMD to dockerfile
pi-hole · Apr 10, 2018 · 3295474 · 3295474
2 parents 76d6a67 + 45a196d
commit 3295474
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 1 deletion.
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -41,6 +41,7 @@ EXPOSE 80
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
+ENV FTL_CMD no-daemon
 
 HEALTHCHECK CMD dig @127.0.0.1 pi.hole || exit 1
 

diff --git a/Dockerfile_debian_aarch64 b/Dockerfile_debian_aarch64
@@ -41,6 +41,7 @@ EXPOSE 80
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
+ENV FTL_CMD no-daemon
 
 HEALTHCHECK CMD dig @127.0.0.1 pi.hole || exit 1
 

diff --git a/Dockerfile_debian_amd64 b/Dockerfile_debian_amd64
@@ -41,6 +41,7 @@ EXPOSE 80
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
+ENV FTL_CMD no-daemon
 
 HEALTHCHECK CMD dig @127.0.0.1 pi.hole || exit 1
 

diff --git a/Dockerfile_debian_armhf b/Dockerfile_debian_armhf
@@ -41,6 +41,7 @@ EXPOSE 80
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
+ENV FTL_CMD no-daemon
 
 HEALTHCHECK CMD dig @127.0.0.1 pi.hole || exit 1
 

diff --git a/start.sh b/start.sh
@@ -14,7 +14,6 @@ export INTERFACE
 export IPv6
 export WEBPASSWORD
 export WEB_PORT
-export FTL_CMD="${FTL_CMD:-no-daemon}"
 
 . /bash_functions.sh