From c90384a99a545d1ce60fe83c2717bb132c7e9fc4 Mon Sep 17 00:00:00 2001 From: Florian Wilhelm <2292245+fwilhe@users.noreply.github.com> Date: Thu, 15 Aug 2024 09:41:31 +0200 Subject: [PATCH] revert changes from #43 and #46 (#94) Simplify the build by removing the dockerfile indirection. This was intended to be used with dependabot but never really worked with how the builder image is published, so we can just remove it to simplify. --- build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/build b/build index 8c2df55..b125ba3 100755 --- a/build +++ b/build @@ -79,14 +79,7 @@ done if [ "$container_image" = localhost/builder ]; then dir="$(dirname -- "$(realpath -- "${BASH_SOURCE[0]}")")" - # 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 "${dir}"/builder.dockerfile ]]; then - "$container_engine" build -t "$container_image" -f "${dir}"/builder.dockerfile "$dir" - else - "$container_engine" build -t "$container_image" "$dir" - fi + "$container_engine" build -t "$container_image" "$dir" fi repo="$(./get_repo)"