diff --git a/Dockerfile_build b/Dockerfile_build index 70e5a28..4ed513b 100644 --- a/Dockerfile_build +++ b/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/ diff --git a/README.md b/README.md index fd8b1fd..6e40183 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,7 @@ There are other environment variables if you want to customize various things in | `DNSMASQ_USER: `
*Experimental Default: root* | Allows running FTLDNS as non-root. | `TEMPERATUREUNIT`:
*Optional Default: c* | Set preferred temperature unit to `c`: Celsius, `k`: Kelvin, or `f` Fahrenheit units. | `WEBUIBOXEDLAYOUT: `
*Optional Default: boxed* | Use boxed layout (helpful when working on large screens) +| `SKIPGRAVITYONBOOT`:
*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. | `QUERY_LOGGING: <"true"\|"false">`
*Optional* *Default: "true"* | Enable query logging or not. To use these env vars in docker run format style them like: `-e DNS1=1.1.1.1` @@ -185,8 +186,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--stretch` | based on tag | Specific architectures and Debian version tags | | +| `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--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") diff --git a/build.yml b/build.yml index 0a33a7c..4e0b783 100644 --- a/build.yml +++ b/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 diff --git a/gh-actions-test.sh b/gh-actions-test.sh index 691ab16..b4ab996 100755 --- a/gh-actions-test.sh +++ b/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 diff --git a/gh-actions-vars.sh b/gh-actions-vars.sh index 6361698..856b04d 100755 --- a/gh-actions-vars.sh +++ b/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" diff --git a/s6/debian-root/etc/cont-init.d/20-start.sh b/s6/debian-root/etc/cont-init.d/20-start.sh index 10d58f7..5c92d59 100644 --- a/s6/debian-root/etc/cont-init.d/20-start.sh +++ b/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 diff --git a/test/conftest.py b/test/conftest.py index 61d68fd..127f957 100644 --- a/test/conftest.py +++ b/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: diff --git a/test/test_volume_data.sh b/test/test_volume_data.sh index 0acf9b2..f82a8e4 100755 --- a/test/test_volume_data.sh +++ b/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"