Skip to content

Commit

Permalink
revert changes from #43 and #46
Browse files Browse the repository at this point in the history
  • Loading branch information
fwilhe committed Aug 14, 2024
1 parent 06e8f3e commit a1c2c03
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 a1c2c03

Please sign in to comment.