Version 4.1

Dockerfile.py

@@ -3,7 +3,7 @@
 """ Dockerfile.py - generates and build dockerfiles
 
 Usage:
- Dockerfile.py [--arch=<arch> ...] [--skip=<arch> ...] [-v] [--no-build | --no-generate] [--no-cache]
+ Dockerfile.py [--arch=<arch> ...] [--skip=<arch> ...] [-v] [-t] [--no-build | --no-generate] [--no-cache]
 
 Options:
  --no-build Skip building the docker images
@@ -12,6 +12,7 @@
  --arch=<arch> What Architecture(s) to build [default: amd64 armel armhf aarch64]
  --skip=<arch> What Architectures(s) to skip [default: None]
  -v Print docker's command output [default: False]
+ -t Print docker's build time [default: False]
 
 Examples:
 """
@@ -27,7 +28,7 @@
 base_vars = {
  'name': 'pihole/pihole',
  'maintainer' : 'adam@diginc.us',
- 's6_version' : 'v1.21.4.0',
+ 's6_version' : 'v1.21.7.0',
 }
 
 os_base_vars = {
@@ -36,9 +37,9 @@
 }
 
 images = {
- 'v4.0': [
+ 'v4.1': [
  {
- 'base': 'debian:stretch-slim',
+ 'base': 'pihole/debian-base:latest',
  'arch': 'amd64'
  },
  {
@@ -91,7 +92,10 @@ def build_dockerfiles(args):
 
  for arch in args['--arch']:
  # TODO: include from external .py that can be shared with Dockerfile.py / Tests / deploy scripts '''
- build('pihole', 'v4.0', arch, args)
+ if arch == 'armel':
+ print "Skipping armel, incompatible upstream binaries/broken"
+ continue
+ build('pihole', 'v4.1', arch, args)
 
 
 def build(docker_repo, version, arch, args):
@@ -102,11 +106,14 @@ def build(docker_repo, version, arch, args):
  dockerfile = 'Dockerfile_{}'.format(arch)
  repo_tag = '{}:{}_{}'.format(docker_repo, version, arch)
  cached_image = '{}/{}'.format('pihole', repo_tag)
+ time=''
+ if args['-t']:
+ time='time '
  no_cache = ''
  if args['--no-cache']:
  no_cache = '--no-cache'
- build_command = 'docker build {no_cache} --pull --cache-from="{cache},{create_tag}" -f {dockerfile} -t {create_tag} .'\
- .format(no_cache=no_cache, cache=cached_image, dockerfile=dockerfile, create_tag=repo_tag)
+ build_command = '{time}docker build {no_cache} --pull --cache-from="{cache},{create_tag}" -f {dockerfile} -t {create_tag} .'\
+ .format(time=time, no_cache=no_cache, cache=cached_image, dockerfile=dockerfile, create_tag=repo_tag)
  print " ::: Building {} into {}".format(dockerfile, repo_tag)
  if args['-v']:
  print build_command, '\n'

Dockerfile.template

@@ -1,16 +1,11 @@
 FROM {{ pihole.base }}
 
-COPY install.sh /usr/local/bin/docker-install.sh
-ENV PIHOLE_INSTALL /root/ph_install.sh
 ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/{{ pihole.s6_version }}/s6-overlay-{{ pihole.s6arch }}.tar.gz
+COPY install.sh /usr/local/bin/install.sh
+ENV PIHOLE_INSTALL /root/ph_install.sh
 
-RUN apt-get update && \
- apt-get install -y curl procps && \
- curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / && \
- rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
- mv /init /s6-init
-
-RUN apt-get update && bash -ex docker-install.sh 2>&1
+RUN bash -ex install.sh 2>&1 && \
+ rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 ENTRYPOINT [ "/s6-init" ]
 
@@ -34,7 +29,7 @@ EXPOSE 443
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
-ENV FTL_CMD no-daemon
+ENV FTL_CMD debug
 
 ENV VERSION {{ pihole.version }}
 ENV ARCH {{ pihole.arch }}

Dockerfile_aarch64

@@ -1,16 +1,11 @@
 FROM multiarch/debian-debootstrap:arm64-stretch-slim
 
-COPY install.sh /usr/local/bin/docker-install.sh
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-aarch64.tar.gz
+COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-aarch64.tar.gz
 
-RUN apt-get update && \
- apt-get install -y curl procps && \
- curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / && \
- rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
- mv /init /s6-init
-
-RUN apt-get update && bash -ex docker-install.sh 2>&1
+RUN bash -ex install.sh 2>&1 && \
+ rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 ENTRYPOINT [ "/s6-init" ]
 
@@ -34,13 +29,13 @@ EXPOSE 443
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
-ENV FTL_CMD no-daemon
+ENV FTL_CMD debug
 
-ENV VERSION v4.0
+ENV VERSION v4.1
 ENV ARCH aarch64
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.0_aarch64"
+LABEL image="pihole/pihole:v4.1_aarch64"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 

Dockerfile_amd64

@@ -1,16 +1,11 @@
-FROM debian:stretch-slim
+FROM pihole/debian-base:latest
 
-COPY install.sh /usr/local/bin/docker-install.sh
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-amd64.tar.gz
+COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
 
-RUN apt-get update && \
- apt-get install -y curl procps && \
- curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / && \
- rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
- mv /init /s6-init
-
-RUN apt-get update && bash -ex docker-install.sh 2>&1
+RUN bash -ex install.sh 2>&1 && \
+ rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 ENTRYPOINT [ "/s6-init" ]
 
@@ -34,13 +29,13 @@ EXPOSE 443
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
-ENV FTL_CMD no-daemon
+ENV FTL_CMD debug
 
-ENV VERSION v4.0
+ENV VERSION v4.1
 ENV ARCH amd64
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.0_amd64"
+LABEL image="pihole/pihole:v4.1_amd64"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 

Dockerfile_armel

@@ -1,16 +1,11 @@
 FROM multiarch/debian-debootstrap:armel-stretch-slim
 
-COPY install.sh /usr/local/bin/docker-install.sh
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-arm.tar.gz
+COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-arm.tar.gz
 
-RUN apt-get update && \
- apt-get install -y curl procps && \
- curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / && \
- rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
- mv /init /s6-init
-
-RUN apt-get update && bash -ex docker-install.sh 2>&1
+RUN bash -ex install.sh 2>&1 && \
+ rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 ENTRYPOINT [ "/s6-init" ]
 
@@ -34,13 +29,13 @@ EXPOSE 443
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
-ENV FTL_CMD no-daemon
+ENV FTL_CMD debug
 
-ENV VERSION v4.0
+ENV VERSION v4.1
 ENV ARCH armel
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.0_armel"
+LABEL image="pihole/pihole:v4.1_armel"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 

Dockerfile_armhf

@@ -1,16 +1,11 @@
 FROM multiarch/debian-debootstrap:armhf-stretch-slim
 
-COPY install.sh /usr/local/bin/docker-install.sh
+ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-armhf.tar.gz
+COPY install.sh /usr/local/bin/install.sh
 ENV PIHOLE_INSTALL /root/ph_install.sh
-ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-armhf.tar.gz
 
-RUN apt-get update && \
- apt-get install -y curl procps && \
- curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C / && \
- rm -rf /var/cache/apt/archives /var/lib/apt/lists/* && \
- mv /init /s6-init
-
-RUN apt-get update && bash -ex docker-install.sh 2>&1
+RUN bash -ex install.sh 2>&1 && \
+ rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 ENTRYPOINT [ "/s6-init" ]
 
@@ -34,13 +29,13 @@ EXPOSE 443
 ENV S6_LOGGING 0
 ENV S6_KEEP_ENV 1
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
-ENV FTL_CMD no-daemon
+ENV FTL_CMD debug
 
-ENV VERSION v4.0
+ENV VERSION v4.1
 ENV ARCH armhf
 ENV PATH /opt/pihole:${PATH}
 
-LABEL image="pihole/pihole:v4.0_armhf"
+LABEL image="pihole/pihole:v4.1_armhf"
 LABEL maintainer="adam@diginc.us"
 LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
 

bash_functions.sh

@@ -120,6 +120,14 @@ setup_dnsmasq_interface() {
  [ -n "$interface" ] && change_setting "PIHOLE_INTERFACE" "${interface}"
 }
 
+setup_dnsmasq_listening_behaviour() {
+ local dnsmasq_listening_behaviour="${1}"
+
+ if [ -n "$dnsmasq_listening_behaviour" ]; then
+ change_setting "DNSMASQ_LISTENING" "${dnsmasq_listening_behaviour}"
+ fi;
+}
+
 setup_dnsmasq_config_if_missing() {
  # When fresh empty directory volumes are used we miss this file
  if [ ! -f /etc/dnsmasq.d/01-pihole.conf ] ; then
@@ -131,10 +139,12 @@ setup_dnsmasq() {
  local dns1="$1"
  local dns2="$2"
  local interface="$3"
+ local dnsmasq_listening_behaviour="$4"
  # Coordinates 
  setup_dnsmasq_config_if_missing
  setup_dnsmasq_dns "$dns1" "$dns2" 
  setup_dnsmasq_interface "$interface"
+ setup_dnsmasq_listening_behaviour "$dnsmasq_listening_behaviour"
  ProcessDNSSettings
 }
 

deploy_docker.sh

@@ -60,12 +60,17 @@ echo "branch: $branch"
 [[ -n "$dry" ]] && echo "DRY RUN: $dry"
 echo "Example tagging: docker tag ${localimg}:armhf ${remoteimg}:${version}_amd64"
 
-$dry ./Dockerfile.py --arch=amd64 --arch=armhf --arch=aarch64
+if [[ -z "$dry" ]] ; then
+ echo "Deleting all manifest data to work around cached old copies preventing updates"
+ rm -rf ~/.docker/manifests/*
+fi
+
+$dry tox
 
 images=()
 for tag in ${!arch_map[@]}; do
  # Verison specific tags for ongoing history
- $dry docker tag $localimg:v4.0_$tag $remoteimg:${version}_${tag}
+ $dry docker tag $localimg:v4.1_$tag $remoteimg:${version}_${tag}
  $dry docker push pihole/pihole:${version}_${tag}
  images+=(pihole/pihole:${version}_${tag})
 done

install.sh

@@ -1,22 +1,25 @@
-#!/bin/bash -ex
+#!/bin/bash -ex / 
+
 mkdir -p /etc/pihole/
 mkdir -p /var/run/pihole
 # Production tags with valid web footers
-export CORE_TAG='v4.0'
-export WEB_TAG='v4.0'
+export CORE_TAG='v4.1'
+export WEB_TAG='v4.1'
 # 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'
+ CORE_TAG='release/v4.1'
 fi
 
-# Make pihole scripts fail searching for `systemctl`,
-# which fails pretty miserably in docker compared to `service`
-# 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 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
 curl https://raw.githubusercontent.com/pi-hole/pi-hole/${CORE_TAG}/automated%20install/basic-install.sh > "$PIHOLE_INSTALL" 
@@ -40,7 +43,8 @@ export USER=pihole
 distro_check
 
 # fix permission denied to resolvconf post-inst /etc/resolv.conf moby/moby issue #1297
-apt-get -y install debconf-utils && echo resolvconf resolvconf/linkify-resolvconf boolean false | debconf-set-selections
+apt-get -y install debconf-utils
+echo resolvconf resolvconf/linkify-resolvconf boolean false | debconf-set-selections
 
 # Tried this - unattended causes starting services during a build, should probably PR a flag to shut that off and switch to that 
 #bash -ex "./${PIHOLE_INSTALL}" --unattended
@@ -63,10 +67,12 @@ mv "${tmpLog}" /
 
 if [[ $USE_CUSTOM_BRANCHES == true ]] ; then
  ln -s /bin/true /usr/local/bin/service
- echo "$CORE_TAG" | tee /etc/pihole/ftlbranch
+ ln -s /bin/true /usr/local/bin/update-rc.d
  echo y | bash -x pihole checkout core $CORE_TAG
  echo y | bash -x pihole checkout web $CORE_TAG
+ echo y | bash -x pihole checkout ftl ${CORE_TAG/v/}
  unlink /usr/local/bin/service
+ unlink /usr/local/bin/update-rc.d
 else
  # Reset to our tags so version numbers get detected correctly
  pushd "${PI_HOLE_LOCAL_REPO}"; git reset --hard "${CORE_TAG}"; popd;
@@ -82,5 +88,5 @@ sed -i $'s/updatePiholeFunc;;/unsupportedFunc;;/g' /usr/local/bin/pihole
 touch /.piholeFirstBoot
 
 # Fix dnsmasq in docker
-grep -q '^user=root' || echo -e '\nuser=root' >> /etc/dnsmasq.conf 
+#grep -q '^user=root' || echo -e '\nuser=root' >> /etc/dnsmasq.conf 
 echo 'Docker install successful'

requirements.txt

@@ -1,6 +1,6 @@
 docker-compose
 jinja2
-pytest
+pytest>=3.6.0
 pytest-cov
 pytest-xdist
 testinfra==1.5.1

s6/debian-root/etc/cont-init.d/20-start.sh

@@ -10,6 +10,10 @@ fi
 # used to start dnsmasq here for gravity to use...now that conflicts port 53
 
 $bashCmd /start.sh
+# Gotta go fast, no time for gravity
+if [ -n "$PYTEST" ]; then 
+ sed -i 's/^gravity_spinup$/#gravity_spinup # DISABLED FOR PYTEST/g' "$(which gravity.sh)" 
+fi
 gravity.sh
 
 # Kill dnsmasq because s6 won't like it if it's running when s6 services start

start.sh

@@ -11,6 +11,7 @@ export WEBLOGDIR
 export DNS1
 export DNS2
 export INTERFACE
+export DNSMASQ_LISTENING_BEHAVIOUR="$DNSMASQ_LISTENING"
 export IPv6
 export WEB_PORT
 
@@ -32,7 +33,7 @@ change_setting "IPV4_ADDRESS" "$ServerIP"
 change_setting "IPV6_ADDRESS" "$ServerIPv6"
 setup_web_port "$WEB_PORT"
 setup_web_password "$WEBPASSWORD"
-setup_dnsmasq "$DNS1" "$DNS2" "$INTERFACE"
+setup_dnsmasq "$DNS1" "$DNS2" "$INTERFACE" "$DNSMASQ_LISTENING_BEHAVIOUR"
 setup_php_env
 setup_dnsmasq_hostnames "$ServerIP" "$ServerIPv6" "$HOSTNAME"
 setup_ipv4_ipv6