switch to using pihole/debian-base for pam fix

Signed-off-by: Adam Hill <adam@diginc.us>

Dockerfile.py

@@ -39,7 +39,7 @@
 images = {
  'v4.0': [
  {
- 'base': 'debian:stretch-slim',
+ 'base': 'pihole/debian-base:latest',
  'arch': 'amd64'
  },
  {
@@ -92,6 +92,9 @@ def build_dockerfiles(args):
 
  for arch in args['--arch']:
  # TODO: include from external .py that can be shared with Dockerfile.py / Tests / deploy scripts '''
+ if arch == 'armel':
+ print "Skipping armel, incompatible upstream binaries/broken"
+ continue
  build('pihole', 'v4.0', arch, args)
 
 

Dockerfile.template

@@ -1,11 +1,6 @@
 FROM {{ pihole.base }}
 
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/{{ pihole.s6_version }}/s6-overlay-{{ pihole.s6arch }}.tar.gz
-
-# Intentionally split out really long step, docker cache = fast builds!
-COPY setup.sh /usr/local/bin/setup.sh
-RUN bash -ex setup.sh 2>&1
-
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
 COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
 

Dockerfile_aarch64

@@ -1,11 +1,6 @@
 FROM multiarch/debian-debootstrap:arm64-stretch-slim
 
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-aarch64.tar.gz
-
-# Intentionally split out really long step, docker cache = fast builds!
-COPY setup.sh /usr/local/bin/setup.sh
-RUN bash -ex setup.sh 2>&1
-
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
 COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
 

Dockerfile_amd64

@@ -1,11 +1,6 @@
-FROM debian:stretch-slim
+FROM pihole/debian-base:latest
 
 ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
-
-# Intentionally split out really long step, docker cache = fast builds!
-COPY setup.sh /usr/local/bin/setup.sh
-RUN bash -ex setup.sh 2>&1
-
 COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
 

Dockerfile_armel

@@ -1,11 +1,6 @@
 FROM multiarch/debian-debootstrap:armel-stretch-slim
 
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-arm.tar.gz
-
-# Intentionally split out really long step, docker cache = fast builds!
-COPY setup.sh /usr/local/bin/setup.sh
-RUN bash -ex setup.sh 2>&1
-
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
 COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
 

Dockerfile_armhf

@@ -1,11 +1,6 @@
 FROM multiarch/debian-debootstrap:armhf-stretch-slim
 
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-armhf.tar.gz
-
-# Intentionally split out really long step, docker cache = fast builds!
-COPY setup.sh /usr/local/bin/setup.sh
-RUN bash -ex setup.sh 2>&1
-
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
 COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
 

install.sh

@@ -8,6 +8,11 @@ export WEB_TAG='v4.0'
 # Only use for pre-production / testing
 export USE_CUSTOM_BRANCHES=false
 
+apt-get update
+apt-get install -y curl procps
+curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C /
+mv /init /s6-init
+
 if [[ $USE_CUSTOM_BRANCHES == true ]] ; then
  CORE_TAG='development'
 fi