diff --git a/src/Dockerfile b/src/Dockerfile index 4b3b890b8..98cc2b175 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -7,7 +7,6 @@ ARG WEB_BRANCH="development-v6" ARG CORE_BRANCH="development-v6" ARG FTL_BRANCH="development-v6" -ENV TZ=Europe/Paris ENV DNSMASQ_USER=pihole ENV FTL_CMD=no-daemon @@ -36,7 +35,6 @@ COPY crontab.txt /crontab.txt RUN git clone --depth 1 --single-branch --branch ${WEB_BRANCH} https://github.com/pi-hole/AdminLTE.git /var/www/html/admin && \ git clone --depth 1 --single-branch --branch ${CORE_BRANCH} https://github.com/pi-hole/pi-hole.git /etc/.pihole ;\ # Download the latest version of pihole-FTL for alpine: - # Probably need this to be built for different FTLARCHs if [ "$TARGETPLATFORM" = "linux/amd64" ]; then FTLARCH=amd64; \ elif [ "$TARGETPLATFORM" = "linux/386" ]; then FTLARCH=386; \ elif [ "$TARGETPLATFORM" = "linux/arm/v6" ]; then FTLARCH=armv6; \ @@ -59,7 +57,6 @@ RUN cd /etc/.pihole && \ install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole && \ install -T -m 0755 ./advanced/Templates/pihole-FTL-prestart.sh /opt/pihole/pihole-FTL-prestart.sh && \ install -T -m 0755 ./advanced/Templates/pihole-FTL-poststop.sh /opt/pihole/pihole-FTL-poststop.sh && \ - # RUN groupadd pihole && useradd -r --no-user-group -g pihole -s /usr/sbin/nologin pihole addgroup -S pihole && adduser -S pihole -G pihole COPY --chmod=0755 bash_functions.sh /usr/bin/bash_functions.sh