From 289e4fced46cebf4cb975ebfae7e03a0676fe1ed Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Sun, 2 Jun 2024 14:40:13 +0200 Subject: [PATCH] .dapper: don't require BuildKit (and buildx) (#1656) 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 --- .dapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dapper b/.dapper index 345969ade..183ca73c6 100755 --- a/.dapper +++ b/.dapper @@ -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"