From bf414721e054493991c9bfd648056af5e90182e6 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Mon, 17 Jul 2023 22:12:41 +0100 Subject: [PATCH] Allow branch names to be passed through as ARGs default `development-v6` (for now) Signed-off-by: Adam Warner --- src/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Dockerfile b/src/Dockerfile index 19a698f3e..17ca5aa30 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -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 @@ -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