Skip to content

Commit 58275ad

Browse files
authored
Merge pull request #1986 from ConnorJC3/fixprow129
[release-1.29] Hardcode buildkit verison to 0.12.5
2 parents bd08fcd + 8fc803d commit 58275ad

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

hack/e2e/ecr.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function ecr_build_and_push() {
2929
# Only setup buildx builder on Prow, allow local users to use docker cache
3030
if [ -n "${PROW_JOB_ID:-}" ]; then
3131
trap "docker buildx rm ebs-csi-multiarch-builder" EXIT
32-
docker buildx create --bootstrap --use --name ebs-csi-multiarch-builder
32+
docker buildx create --driver-opt=image=moby/buildkit:v0.12.5 --bootstrap --use --name ebs-csi-multiarch-builder
3333
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
3434
fi
3535

hack/prow.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ loudecho "Set up Docker Buildx"
3232
# and https://github.com/kubernetes-csi/csi-release-tools/blob/master/build.make#L132
3333
export DOCKER_CLI_EXPERIMENTAL=enabled
3434
trap "docker buildx rm multiarchimage-buildertest" EXIT
35-
docker buildx create --bootstrap --use --name multiarchimage-buildertest
35+
docker buildx create --driver-opt=image=moby/buildkit:v0.12.5 --bootstrap --use --name multiarchimage-buildertest
3636

3737
loudecho "Set up QEMU"
3838
# See https://github.com/docker/setup-qemu-action

0 commit comments

Comments
 (0)