Merge pull request #706 from pi-hole/dev

Dev to Master [v5.2]

Dockerfile_build

@@ -1,4 +1,4 @@
-FROM python:buster
+FROM python:3.8-buster
 
 # Only works for docker CLIENT (bind mounted socket)
 COPY --from=docker:18.09.3 /usr/local/bin/docker /usr/local/bin/

README.md

@@ -121,6 +121,7 @@ There are other environment variables if you want to customize various things in
 | `DNSMASQ_USER: <pihole\|root>`<br/> *Experimental Default: root* | Allows running FTLDNS as non-root.
 | `TEMPERATUREUNIT`: <c\|k\|f><br/>*Optional Default: c* | Set preferred temperature unit to `c`: Celsius, `k`: Kelvin, or `f` Fahrenheit units.
 | `WEBUIBOXEDLAYOUT: <boxed\|traditional>`<br/>*Optional Default: boxed* | Use boxed layout (helpful when working on large screens)
+| `SKIPGRAVITYONBOOT`: <Not Set\|1><br/> *Optional Default: Not Set* | Use this option to skip updating the Gravity Database when booting up the container.  By default this environment variable is not set so the Gravity Database will be updated when the container starts up.  Setting this environment variable to 1 (or anything) will cause the Gravity Database to not be updated when container starts up.
 
 To use these env vars in docker run format style them like: `-e DNS1=1.1.1.1`
 
@@ -184,8 +185,8 @@ The primary docker tags / versions are explained in the following table.  [Click
 | ---                     | ------------ | -----------                                                             | ---------- |
 | `latest`                | auto detect  | x86, arm, or arm64 container, docker auto detects your architecture.    | [Dockerfile](https://github.com/pi-hole/docker-pi-hole/blob/master/Dockerfile) |
 | `v5.0`                  | auto detect  | Versioned tags, if you want to pin against a specific Pi-hole version, use one of these |  |
-| `v5.0-stretch`          | auto detect  | Versioned tags, if you want to pin against a specific Pi-hole and Debian version, use one of these |  |
+| `v5.0-buster`           | auto detect  | Versioned tags, if you want to pin against a specific Pi-hole and Debian version, use one of these |  |
-| `v5.0-<arch>-stretch`   | based on tag | Specific architectures and Debian version tags | |
+| `v5.0-<arch>-buster `   | based on tag | Specific architectures and Debian version tags | |
 | `dev`                   | auto detect  | like latest tag, but for the development branch (pushed occasionally)   | |
 
 ### `pihole/pihole:latest` [![](https://images.microbadger.com/badges/image/pihole/pihole:latest.svg)](https://microbadger.com/images/pihole/pihole "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/pihole/pihole:latest.svg)](https://microbadger.com/images/pihole/pihole "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/version/pihole/pihole:latest.svg)](https://microbadger.com/images/pihole/pihole "Get your own version badge on microbadger.com")

VERSION

@@ -1 +1 @@
-v5.1.2
+v5.2

build.yml

@@ -12,38 +12,38 @@ x-common-args: &common-args
 
 services:
   amd64:
-    image: pihole:${PIHOLE_VERSION}-amd64-${DEBIAN_VERSION:-stretch}
+    image: pihole:${PIHOLE_VERSION}-amd64-${DEBIAN_VERSION:-buster}
     build:
       context: .
       args:
         <<: *common-args
-        PIHOLE_BASE: pihole/debian-base:${DEBIAN_VERSION:-stretch}
+        PIHOLE_BASE: pihole/debian-base:${DEBIAN_VERSION:-buster}
         PIHOLE_ARCH: amd64
         S6_ARCH: amd64
   armel:
-    image: pihole:${PIHOLE_VERSION}-armel-${DEBIAN_VERSION:-stretch}
+    image: pihole:${PIHOLE_VERSION}-armel-${DEBIAN_VERSION:-buster}
     build:
       context: .
       args:
         <<: *common-args
-        PIHOLE_BASE: multiarch/debian-debootstrap:armel-${DEBIAN_VERSION:-stretch}-slim
+        PIHOLE_BASE: multiarch/debian-debootstrap:armel-${DEBIAN_VERSION:-buster}-slim
         PIHOLE_ARCH: armel
         S6_ARCH: arm
   armhf:
-    image: pihole:${PIHOLE_VERSION}-armhf-${DEBIAN_VERSION:-stretch}
+    image: pihole:${PIHOLE_VERSION}-armhf-${DEBIAN_VERSION:-buster}
     build:
       context: .
       args:
         <<: *common-args
-        PIHOLE_BASE: multiarch/debian-debootstrap:armhf-${DEBIAN_VERSION:-stretch}-slim
+        PIHOLE_BASE: multiarch/debian-debootstrap:armhf-${DEBIAN_VERSION:-buster}-slim
         PIHOLE_ARCH: arm
         S6_ARCH: arm
   arm64:
-    image: pihole:${PIHOLE_VERSION}-arm64-${DEBIAN_VERSION:-stretch}
+    image: pihole:${PIHOLE_VERSION}-arm64-${DEBIAN_VERSION:-buster}
     build:
       context: .
       args:
         <<: *common-args
-        PIHOLE_BASE: multiarch/debian-debootstrap:arm64-${DEBIAN_VERSION:-stretch}-slim
+        PIHOLE_BASE: multiarch/debian-debootstrap:arm64-${DEBIAN_VERSION:-buster}-slim
         PIHOLE_ARCH: arm64
         S6_ARCH: aarch64

docker_run.sh

@@ -34,7 +34,7 @@ for i in $(seq 1 20); do
     fi
 
     if [ $i -eq 20 ] ; then
-        echo -e "\nTimed out waiting for Pi-hole start, consult check your container logs for more info (\`docker logs pihole\`)"
+        echo -e "\nTimed out waiting for Pi-hole start, consult your container logs for more info (\`docker logs pihole\`)"
         exit 1
     fi
 done;

gh-actions-test.sh

@@ -5,7 +5,7 @@ set -ex
 #
 # @environment ${ARCH}              The architecture to build. Example: amd64.
 # @environment ${DEBIAN_VERSION}    Debian version to build. ('buster' or 'stretch').
-# @environment ${ARCH_IMAGE}        What the Docker Hub Image should be tagged as. Example: pihole/pihole:master-amd64-stretch
+# @environment ${ARCH_IMAGE}        What the Docker Hub Image should be tagged as. Example: pihole/pihole:master-amd64-buster
 
 # setup qemu/variables
 docker run --rm --privileged multiarch/qemu-user-static:register --reset > /dev/null

gh-actions-vars.sh

@@ -2,14 +2,14 @@
 set -a
 
 # @environment ${ARCH}                    The architecture to build. Defaults to 'amd64'.
-# @environment ${DEBIAN_VERSION}          Debian version to build. Defaults to 'stretch'.
+# @environment ${DEBIAN_VERSION}          Debian version to build. Defaults to 'buster'.
 # @environment ${DOCKER_HUB_REPO}         The docker hub repo to tag images for. Defaults to 'pihole'.
 # @environment ${DOCKER_HUB_IMAGE_NAME}   The name of the resulting image. Defaults to 'pihole'.
 
 GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD | sed "s/\//-/g")
 GIT_TAG=$(git describe --tags --exact-match 2> /dev/null || true)
 
-DEFAULT_DEBIAN_VERSION="stretch"
+DEFAULT_DEBIAN_VERSION="buster"
 
 if [[ -z "${ARCH}" ]]; then
     ARCH="amd64"

install.sh

@@ -4,7 +4,10 @@ mkdir -p /etc/pihole/
 mkdir -p /var/run/pihole
 # Production tags with valid web footers
 export CORE_VERSION="$(cat /etc/docker-pi-hole-version)"
-export WEB_VERSION="v5.1.1"
+export WEB_VERSION="${CORE_VERSION}"
+export PIHOLE_SKIP_OS_CHECK=true
+# Overwrite WEB_VERSION if core and web versions are different
+#export WEB_VERSION="v5.1.1"
 
 # Only use for pre-production / testing
 export CHECKOUT_BRANCHES=false

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

@@ -14,7 +14,11 @@ $bashCmd /start.sh
 if [ -n "$PYTEST" ]; then 
     sed -i 's/^gravity_spinup$/#gravity_spinup # DISABLED FOR PYTEST/g' "$(which gravity.sh)" 
 fi
-gravity.sh
+if [ -z "$SKIPGRAVITYONBOOT" ]; then
+    gravity.sh
+else
+    echo "  Skipping Gravity Database Update."
+fi
 
 # Kill dnsmasq because s6 won't like it if it's running when s6 services start
 kill -9 $(pgrep pihole-FTL) || true

test/conftest.py

@@ -9,7 +9,7 @@ import types
 local_host = testinfra.get_host('local://')
 check_output = local_host.check_output
 
-DEBIAN_VERSION = os.environ.get('DEBIAN_VERSION', 'stretch')
+DEBIAN_VERSION = os.environ.get('DEBIAN_VERSION', 'buster')
 __version__ = None
 dotdot = os.path.abspath(os.path.join(os.path.abspath(__file__), os.pardir, os.pardir))
 with open('{}/VERSION'.format(dotdot), 'r') as v:

test/test_volume_data.sh

@@ -33,7 +33,7 @@ trap "cleanup" INT TERM EXIT
 # VOLUME TESTS
 
 # Given...
-DEBIAN_VERSION="$(DEBIAN_VERSION:-stretch)"
+DEBIAN_VERSION="$(DEBIAN_VERSION:-buster)"
 IMAGE="${1:-pihole:v5.0-amd64}-${DEBIAN_VERSION}"   # Default is latest build test image (generic, non release/branch tag)
 VOLUMES="$(mktemp -d)"                              # A fresh volume directory
 VOL_PH="$VOLUMES/pihole"