From 394ed49851945a22c7bca7095b306cac930a318c Mon Sep 17 00:00:00 2001 From: Sunny Song Date: Wed, 26 Apr 2023 17:01:43 +0000 Subject: [PATCH] Squashed 'release-tools/' changes from 6613c398..4133d1df 4133d1df Merge pull request #226 from msau42/cloudbuild 8d519d23 Pin buildkit to v0.10.6 to workaround v0.11 bug with docker manifest 6e04a030 Merge pull request #224 from msau42/cloudbuild 26fdfffd Update cloudbuild image git-subtree-dir: release-tools git-subtree-split: 4133d1df083eaa65bdeddd0530d54278529c7a60 --- build.make | 2 +- cloudbuild.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.make b/build.make index ff428890d..bceab34d2 100644 --- a/build.make +++ b/build.make @@ -148,7 +148,7 @@ DOCKER_BUILDX_CREATE_ARGS ?= $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-% set -ex; \ export DOCKER_CLI_EXPERIMENTAL=enabled; \ - docker buildx create $(DOCKER_BUILDX_CREATE_ARGS) --use --name multiarchimage-buildertest; \ + docker buildx create $(DOCKER_BUILDX_CREATE_ARGS) --use --name multiarchimage-buildertest --driver-opt image=moby/buildkit:v0.10.6; \ trap "docker buildx rm multiarchimage-buildertest" EXIT; \ dockerfile_linux=$$(if [ -e ./$(CMDS_DIR)/$*/Dockerfile ]; then echo ./$(CMDS_DIR)/$*/Dockerfile; else echo Dockerfile; fi); \ dockerfile_windows=$$(if [ -e ./$(CMDS_DIR)/$*/Dockerfile.Windows ]; then echo ./$(CMDS_DIR)/$*/Dockerfile.Windows; else echo Dockerfile.Windows; fi); \ diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 4bcffad3a..6b76a9ed1 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -26,7 +26,7 @@ steps: # The image must contain bash and curl. Ideally it should also contain # the desired version of Go (currently defined in release-tools/prow.sh), # but that just speeds up the build and is not required. - - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55' + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20230424-910a2a439d' entrypoint: ./.cloudbuild.sh env: - GIT_TAG=${_GIT_TAG}