diff --git a/Dockerfile b/Dockerfile index 6d4f974..32b7a0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ FROM $PIHOLE_BASE ARG PIHOLE_ARCH ENV PIHOLE_ARCH "${PIHOLE_ARCH}" +ARG PIHOLE_TAG +ENV PIHOLE_TAG "${PIHOLE_TAG}" ARG S6_ARCH ARG S6_VERSION ENV S6OVERLAY_RELEASE "https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-${S6_ARCH}.tar.gz" @@ -46,9 +48,6 @@ ARG PIHOLE_VERSION ENV VERSION "${PIHOLE_VERSION}" ENV PATH /opt/pihole:${PATH} -ARG PIHOLE_TAG -ENV PIHOLE_TAG "${PIHOLE_TAG}" - ARG NAME LABEL image="${NAME}:${PIHOLE_VERSION}_${PIHOLE_ARCH}" ARG MAINTAINER diff --git a/install.sh b/install.sh index 16e2c27..e608807 100644 --- a/install.sh +++ b/install.sh @@ -92,7 +92,8 @@ sed -i $'s/)\s*uninstallFunc/) unsupportedFunc/g' /usr/local/bin/pihole sed -i $'s/echo_current_diagnostic "Operating system"/echo_current_diagnostic "Operating system"\\\n log_write "${INFO} Pi-hole Docker Container: ${PIHOLE_TAG:-PIHOLE_TAG is unset}"/g' /opt/pihole/piholeDebug.sh # Inject container tag into web interface footer... -sed -i $"s/