From c0fa8de914a6cf8996dd40f68c6c099e5f422991 Mon Sep 17 00:00:00 2001 From: yubiuser Date: Sun, 25 Aug 2024 11:51:13 +0200 Subject: [PATCH 1/2] Set default tag for locally build images to pihole:local Signed-off-by: yubiuser --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 61f4a58..eafbf95 100755 --- a/build.sh +++ b/build.sh @@ -8,17 +8,17 @@ usage() { echo " -c, --corebranch Specify Core branch" echo " -w, --webbranch Specify Web branch" echo " -p, --paddbranch Specify PADD branch" - echo " -t, --tag Specify Docker image tag (default: pihole)" + echo " -t, --tag Specify Docker image tag (default: pihole:local)" echo " -l, --local Use locally built FTL binary (requires src/pihole-FTL file)" echo " use_cache Enable caching (by default --no-cache is used)" echo "" echo "If no options are specified, the following command will be executed:" - echo " docker buildx build src/. --tag pihole --load --no-cache" + echo " docker buildx build src/. --tag pihole:local --load --no-cache" exit 1 } # Set default values -DOCKER_BUILD_CMD="docker buildx build src/. --tag pihole --load --no-cache" +DOCKER_BUILD_CMD="docker buildx build src/. --tag pihole:local --load --no-cache" FTL_FLAG=false # Parse command line arguments @@ -70,7 +70,7 @@ while [[ $# -gt 0 ]]; do ;; -t | --tag) TAG="$2" - DOCKER_BUILD_CMD=${DOCKER_BUILD_CMD/pihole/$TAG} + DOCKER_BUILD_CMD=${DOCKER_BUILD_CMD/pihole:local/$TAG} shift shift ;; From 794ba9a552be39b0595a7647ae159d5b71f71887 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 25 Aug 2024 13:45:08 +0100 Subject: [PATCH 2/2] Update Readme to reflect new local image tag name Signed-off-by: Adam Warner --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2bf4d5e..5167a68 100644 --- a/README.md +++ b/README.md @@ -216,14 +216,14 @@ The preferred method is to clone this repository and build the image locally wit - `-f ` / `--ftlbranch `: Specify FTL branch (cannot be used in conjunction with `-l`) - `-c ` / `--corebranch `: Specify Core branch - `-w ` / `--webbranch `: Specify Web branch -- `-t ` / `--tag `: Specify Docker image tag (default: `pihole`) +- `-t ` / `--tag `: Specify Docker image tag (default: `pihole:local`) - `-l` / `--local`: Use locally built FTL binary (requires `src/pihole-FTL` file) - `use_cache`: Enable caching (by default `--no-cache` is used) If no options are specified, the following command will be executed: ``` -docker buildx build src/. --tag pihole --no-cache +docker buildx build src/. --tag pihole:local --no-cache ``` ### Pi-hole features