From 45a196d9c4a797f1729b6113efb30f2e160bac19 Mon Sep 17 00:00:00 2001 From: diginc Date: Tue, 10 Apr 2018 12:33:25 -0500 Subject: [PATCH] Move FTL_CMD to dockerfile --- Dockerfile.template | 1 + Dockerfile_debian_aarch64 | 1 + Dockerfile_debian_amd64 | 1 + Dockerfile_debian_armhf | 1 + start.sh | 1 - 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile.template b/Dockerfile.template index f59cdbb04..ba901810d 100644 --- 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 index 0a347328e..0907fb73a 100644 --- 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 index fc22746d2..5d625cae3 100644 --- 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 index 667f7048c..132d32bfb 100644 --- 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 index 87d6b4980..89b9ad6c6 100755 --- 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