Some of these should not be user overridable
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
parent
a9ecd4e7a2
commit
f94fb54a18
|
@ -2,11 +2,7 @@ ARG PIHOLE_BASE
|
||||||
FROM "${PIHOLE_BASE:-ghcr.io/pi-hole/docker-pi-hole-base:bullseye-slim}"
|
FROM "${PIHOLE_BASE:-ghcr.io/pi-hole/docker-pi-hole-base:bullseye-slim}"
|
||||||
|
|
||||||
ARG PIHOLE_DOCKER_TAG
|
ARG PIHOLE_DOCKER_TAG
|
||||||
ENV PIHOLE_DOCKER_TAG "${PIHOLE_DOCKER_TAG}"
|
RUN echo "${PIHOLE_DOCKER_TAG}" > /pihole.docker.tag
|
||||||
|
|
||||||
ENV S6_OVERLAY_VERSION v3.1.1.2
|
|
||||||
|
|
||||||
ENV PIHOLE_INSTALL /etc/.pihole/automated\ install/basic-install.sh
|
|
||||||
|
|
||||||
ENTRYPOINT [ "/s6-init" ]
|
ENTRYPOINT [ "/s6-init" ]
|
||||||
|
|
||||||
|
@ -33,7 +29,6 @@ ENV S6_KEEP_ENV 1
|
||||||
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
|
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
|
||||||
ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME 0
|
ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME 0
|
||||||
|
|
||||||
|
|
||||||
ENV FTLCONF_LOCAL_IPV4 0.0.0.0
|
ENV FTLCONF_LOCAL_IPV4 0.0.0.0
|
||||||
ENV FTL_CMD no-daemon
|
ENV FTL_CMD no-daemon
|
||||||
ENV DNSMASQ_USER pihole
|
ENV DNSMASQ_USER pihole
|
||||||
|
|
|
@ -9,7 +9,7 @@ fi
|
||||||
. /usr/local/bin/bash_functions.sh
|
. /usr/local/bin/bash_functions.sh
|
||||||
|
|
||||||
# shellcheck source=/dev/null
|
# shellcheck source=/dev/null
|
||||||
SKIP_INSTALL=true . "${PIHOLE_INSTALL}"
|
SKIP_INSTALL=true . /etc/.pihole/automated\ install/basic-install.sh
|
||||||
|
|
||||||
echo " [i] Starting docker specific checks & setup for docker pihole/pihole"
|
echo " [i] Starting docker specific checks & setup for docker pihole/pihole"
|
||||||
|
|
||||||
|
|
|
@ -27,8 +27,9 @@ esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
DOCKER_TAG=$(cat /pihole.docker.tag)
|
||||||
# Helps to have some additional tools in the dev image when debugging
|
# Helps to have some additional tools in the dev image when debugging
|
||||||
if [[ "${PIHOLE_DOCKER_TAG}" = 'nightly' || "${PIHOLE_DOCKER_TAG}" = 'dev' ]]; then
|
if [[ "${DOCKER_TAG}" = 'nightly' || "${DOCKER_TAG}" = 'dev' ]]; then
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install --no-install-recommends -y nano less
|
apt-get install --no-install-recommends -y nano less
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
@ -36,6 +37,8 @@ fi
|
||||||
|
|
||||||
detect_arch
|
detect_arch
|
||||||
|
|
||||||
|
S6_OVERLAY_VERSION=v3.1.1.2
|
||||||
|
|
||||||
curl -L -s "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" | tar Jxpf - -C /
|
curl -L -s "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" | tar Jxpf - -C /
|
||||||
curl -L -s "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" | tar Jxpf - -C /
|
curl -L -s "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" | tar Jxpf - -C /
|
||||||
|
|
||||||
|
@ -66,7 +69,7 @@ export PIHOLE_SKIP_OS_CHECK=true
|
||||||
curl -sSL https://install.pi-hole.net | bash -sex -- --unattended
|
curl -sSL https://install.pi-hole.net | bash -sex -- --unattended
|
||||||
|
|
||||||
# At this stage, if we are building a :nightly tag, then switch the Pi-hole install to dev versions
|
# At this stage, if we are building a :nightly tag, then switch the Pi-hole install to dev versions
|
||||||
if [[ "${PIHOLE_DOCKER_TAG}" = 'nightly' ]]; then
|
if [[ "${DOCKER_TAG}" = 'nightly' ]]; then
|
||||||
yes | pihole checkout dev
|
yes | pihole checkout dev
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue