Skip to content

Commit

Permalink
revert changes from #43 and #46 (#94)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
fwilhe committed Aug 15, 2024
1 parent 06e8f3e commit c90384a
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down

0 comments on commit c90384a

Please sign in to comment.