Skip to content

Commit

Permalink
Allow branch names to be passed through as ARGs default `development-…
Browse files Browse the repository at this point in the history
…v6` (for now)

Signed-off-by: Adam Warner <[email protected]>
  • Loading branch information
PromoFaux committed Jul 20, 2023
1 parent 41511c5 commit bf41472
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ RUN apk add --no-cache \
coreutils \
procps

ARG WEB_BRANCH="development-v6"
ARG CORE_BRANCH="development-v6"
ARG FTL_BRANCH="development-v6"

# 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
Expand All @@ -32,7 +36,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then FTLARCH=amd64; \
elif [ "$TARGETPLATFORM" = "linux/arm64/v8" ]; then FTLARCH=armv64; \
elif [ "$TARGETPLATFORM" = "linux/riscv64" ]; then FTLARCH=riscv64; \
else FTLARCH=amd64; fi \
&& curl -sSL "https://ftl.pi-hole.net/development-v6/pihole-FTL-${FTLARCH}" -o /usr/bin/pihole-FTL && \
&& curl -sSL "https://ftl.pi-hole.net/${FTL_BRANCH}/pihole-FTL-${FTLARCH}" -o /usr/bin/pihole-FTL && \
chmod +x /usr/bin/pihole-FTL


Expand Down

0 comments on commit bf41472

Please sign in to comment.