From 91a483614ba35ceb0a21cec8682a1831320f7db1 Mon Sep 17 00:00:00 2001
From: diginc <adam@diginc.us>
Date: Fri, 26 Jan 2018 21:10:56 -0600
Subject: [PATCH] updates from PR comments

---
 Dockerfile.template       | 3 +--
 Dockerfile_debian_aarch64 | 6 +++---
 Dockerfile_debian_amd64   | 6 +++---
 Dockerfile_debian_armhf   | 6 +++---
 install.sh                | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index f59dc83..13fe453 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -4,7 +4,6 @@ LABEL image="{{ pihole.name }}:{{ pihole.os }}_{{ pihole.arch }}"
 LABEL maintainer="{{ pihole.maintainer }}"
 LABEL url="https://www.github.com/diginc/docker-pi-hole"
 
-ARG DEBIAN_FRONTED=noninteractive
 ENV TAG {{ pihole.os }}
 ENV ARCH {{ pihole.arch }}
 ENV PATH /opt/pihole:${PATH}
@@ -19,7 +18,7 @@ RUN apt-get update && \
     curl -L -s $S6OVERLAY_RELEASE \
         | tar xvzf - -C / && \
     docker-install.sh && \
-    rm -rf /var/cache/apt/archives /var/lib/apt/lists/* &&
+    rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
     mv /init /s6-init
 
 ENTRYPOINT [ "/s6-init" ]
diff --git a/Dockerfile_debian_aarch64 b/Dockerfile_debian_aarch64
index c22ec64..ab5ba21 100644
--- a/Dockerfile_debian_aarch64
+++ b/Dockerfile_debian_aarch64
@@ -4,7 +4,6 @@ LABEL image="diginc/pi-hole:debian_aarch64"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/diginc/docker-pi-hole"
 
-ARG DEBIAN_FRONTED=noninteractive
 ENV TAG debian
 ENV ARCH aarch64
 ENV PATH /opt/pihole:${PATH}
@@ -19,9 +18,10 @@ RUN apt-get update && \
     curl -L -s $S6OVERLAY_RELEASE \
         | tar xvzf - -C / && \
     docker-install.sh && \
-    rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
+    rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
+    mv /init /s6-init
 
-ENTRYPOINT [ "/init" ]
+ENTRYPOINT [ "/s6-init" ]
 
 ADD s6/debian-root /
 COPY s6/service /usr/local/bin/service
diff --git a/Dockerfile_debian_amd64 b/Dockerfile_debian_amd64
index e5ffef9..0118d5f 100644
--- a/Dockerfile_debian_amd64
+++ b/Dockerfile_debian_amd64
@@ -4,7 +4,6 @@ LABEL image="diginc/pi-hole:debian_amd64"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/diginc/docker-pi-hole"
 
-ARG DEBIAN_FRONTED=noninteractive
 ENV TAG debian
 ENV ARCH amd64
 ENV PATH /opt/pihole:${PATH}
@@ -19,9 +18,10 @@ RUN apt-get update && \
     curl -L -s $S6OVERLAY_RELEASE \
         | tar xvzf - -C / && \
     docker-install.sh && \
-    rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
+    rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
+    mv /init /s6-init
 
-ENTRYPOINT [ "/init" ]
+ENTRYPOINT [ "/s6-init" ]
 
 ADD s6/debian-root /
 COPY s6/service /usr/local/bin/service
diff --git a/Dockerfile_debian_armhf b/Dockerfile_debian_armhf
index 4102ec9..cc92bc8 100644
--- a/Dockerfile_debian_armhf
+++ b/Dockerfile_debian_armhf
@@ -4,7 +4,6 @@ LABEL image="diginc/pi-hole:debian_armhf"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/diginc/docker-pi-hole"
 
-ARG DEBIAN_FRONTED=noninteractive
 ENV TAG debian
 ENV ARCH armhf
 ENV PATH /opt/pihole:${PATH}
@@ -19,9 +18,10 @@ RUN apt-get update && \
     curl -L -s $S6OVERLAY_RELEASE \
         | tar xvzf - -C / && \
     docker-install.sh && \
-    rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
+    rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
+    mv /init /s6-init
 
-ENTRYPOINT [ "/init" ]
+ENTRYPOINT [ "/s6-init" ]
 
 ADD s6/debian-root /
 COPY s6/service /usr/local/bin/service
diff --git a/install.sh b/install.sh
index 3c2b667..d74791d 100755
--- a/install.sh
+++ b/install.sh
@@ -10,7 +10,7 @@ export USE_DEVELOPMENT_BRANCHES=true
 # For more info see docker/docker issue #7459
 which systemctl && mv "$(which systemctl)" /bin/no_systemctl
 # debconf-apt-progress seems to hang so get rid of it too
-which which debconf-apt-progress && mv "$(which debconf-apt-progress)" /bin/no_debconf-apt-progress
+which debconf-apt-progress && mv "$(which debconf-apt-progress)" /bin/no_debconf-apt-progress
 
 # Get the install functions
 CUSTOM_INSTALL='development'