Update src/Dockerfile

Co-authored-by: RD WebDesign <[email protected]>
Signed-off-by: edgd1er <[email protected]>

src/Dockerfile

@@ -6,8 +6,8 @@ ARG TARGETPLATFORM
 ARG WEB_BRANCH="development-v6"
 ARG CORE_BRANCH="development-v6"
 ARG FTL_BRANCH="development-v6"
+ARG PIHOLE_DOCKER_TAG="unknown"
 
-ENV TZ=Europe/Paris
 ENV DNSMASQ_USER=pihole
 ENV FTL_CMD=no-daemon
 
@@ -29,16 +29,13 @@ RUN apk add --no-cache \
     ncurses \
     binutils
 
-ARG PIHOLE_DOCKER_TAG="unknown"
-RUN echo "${PIHOLE_DOCKER_TAG}" > /pihole.docker.tag
 ADD https://ftl.pi-hole.net/macvendor.db /macvendor.db
 COPY crontab.txt /crontab.txt
 
 # download a the main repos from github
-RUN git clone --depth 1 --single-branch --branch development-v6 https://github.com/pi-hole/AdminLTE.git /var/www/html/admin && \
-    git clone --depth 1 --single-branch --branch development-v6 https://github.com/pi-hole/pi-hole.git /etc/.pihole ;\
+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; \
@@ -61,8 +58,8 @@ 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
+    addgroup -S pihole && adduser -S pihole -G pihole && \
+    echo "${PIHOLE_DOCKER_TAG}" > /pihole.docker.tag
 
 COPY --chmod=0755 bash_functions.sh /usr/bin/bash_functions.sh
 COPY --chmod=0755 start.sh /usr/bin/start.sh