Merge pull request #3235 from fabriziopandini/fix-image-build

🌱 Image builds should prepull experimental docker buildkit deps
kubernetes-sigs · Jun 23, 2020 · 241d247 · 241d247
2 parents d044be3 + 52f7bc7
commit 241d247
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -472,6 +472,7 @@ release-binary: $(RELEASE_DIR)
 
 .PHONY: release-staging
 release-staging: ## Builds and push container images to the staging bucket.
+	docker pull docker.io/docker/dockerfile:experimental
 	REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all docker-push-all release-alias-tag
 
 RELEASE_ALIAS_TAG=$(PULL_BASE_REF)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -10,6 +10,7 @@ steps:
     - DOCKER_CLI_EXPERIMENTAL=enabled
     - TAG=$_GIT_TAG
     - PULL_BASE_REF=$_PULL_BASE_REF
+    - DOCKER_BUILDKIT=1
     args:
     - release-staging
   - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200619-68869a4'
@@ -19,6 +20,7 @@ steps:
     - DOCKER_CLI_EXPERIMENTAL=enabled
     - TAG=$_GIT_TAG
     - PULL_BASE_REF=$_PULL_BASE_REF
+    - DOCKER_BUILDKIT=1
     args:
     - release-staging
 substitutions: