From ed18370059d19f9606a8ea3172bee646631661b4 Mon Sep 17 00:00:00 2001 From: Florian Wilhelm <2292245+fwilhe@users.noreply.github.com> Date: Tue, 12 Dec 2023 15:21:46 +0000 Subject: [PATCH] Build from 'builder.dockerfile' if that exists This change is needed to allow keeping the builder updated via dependabot. --- build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build b/build index 1869515..309cb4f 100755 --- a/build +++ b/build @@ -75,8 +75,14 @@ done if [ "$container_image" = localhost/builder ]; then dir="$(dirname -- "$(realpath -- "${BASH_SOURCE[0]}")")" - containerfile=$([[ -f builder.dockerfile ]] && echo -f builder.dockerfile || true ) - "$container_engine" build -t "$container_image" $containerfile "$dir" + # Build from 'builder.dockerfile' if that exists, otherwise the default file name will be 'Dockerfile' or 'Containerfile'. + # It is recommended to call the file 'builder.dockerfile' to make it's intention clear. + # That file might only contain a single line 'FROM ghcr.io/gardenlinux/builder:...' which can be updated via dependabot. + if [[ -f builder.dockerfile ]]; then + "$container_engine" build -t "$container_image" -f builder.dockerfile "$dir" + else + "$container_engine" build -t "$container_image" "$dir" + fi fi repo="$(./get_repo)"