Skip to content

Commit

Permalink
.dapper: don't require BuildKit (and buildx) (#1656)
Browse files Browse the repository at this point in the history
Building the .dapper-targeted container image doesn't require BuildKit
and buildx; this allows "make clusters" etc. to work on setups without
buildx.

Signed-off-by: Stephen Kitt <[email protected]>
  • Loading branch information
skitt authored Jun 2, 2024
1 parent f98f329 commit 289e4fc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .dapper
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ buildargs=(--build-arg "ORG=${ORG}" --build-arg "PROJECT=${PROJECT}")
gitid="$(git symbolic-ref --short HEAD 2>/dev/null | tr / _ || :)"
gitid="${gitid:-$(git show --format=%h -s)}"
container="$(basename "$(pwd)"):${gitid}"
DOCKER_BUILDKIT=1 docker build -t "${container}" -f "${file}" "${buildargs[@]}" .
docker build -t "${container}" -f "${file}" "${buildargs[@]}" .

extract_var() {
docker inspect "$1" | grep "$2" | sed -E "s/.*\"$2=(.*)\",?/\1/;q"
Expand Down

0 comments on commit 289e4fc

Please sign in to comment.