Skip to content

Commit

Permalink
Merge pull request #3241 from vincepri/capd-image-fix
Browse files Browse the repository at this point in the history
🌱 Pull images when building capd as well
  • Loading branch information
k8s-ci-robot authored Jun 24, 2020
2 parents 49fdf54 + e7eb0a6 commit 303f492
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion test/infrastructure/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ modules: ## Runs go mod to ensure modules are up to date.

.PHONY: docker-build
docker-build: ## Build the docker image for controller-manager
DOCKER_BUILDKIT=1 docker build --pull --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) ../../.. -t $(CONTROLLER_IMG)-$(ARCH):$(TAG) --file Dockerfile
DOCKER_BUILDKIT=1 docker build --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) ../../.. -t $(CONTROLLER_IMG)-$(ARCH):$(TAG) --file Dockerfile
MANIFEST_IMG=$(CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image
$(MAKE) set-manifest-pull-policy

Expand Down Expand Up @@ -212,6 +212,9 @@ release-manifests: $(RELEASE_DIR) ## Builds the manifests to publish with a rele

.PHONY: release-staging
release-staging: ## Builds and push container images to the staging bucket.
docker pull docker.io/docker/dockerfile:experimental
docker pull docker.io/library/golang:1.13.12
docker pull gcr.io/distroless/static:latest
REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all docker-push-all release-alias-tag

RELEASE_ALIAS_TAG=$(PULL_BASE_REF)
Expand Down

0 comments on commit 303f492

Please sign in to comment.