Skip to content

Commit

Permalink
implement improvements from mdbooth
Browse files Browse the repository at this point in the history
  • Loading branch information
cahillsf committed Sep 11, 2023
1 parent 5f528e4 commit 2888de1
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,9 @@ docker-build-all: $(addprefix docker-build-,$(ALL_ARCH)) ## Build docker images
docker-build-%:
$(MAKE) ARCH=$* docker-build

docker-push-%: docker-build-%
$(MAKE) ARCH=$* docker-push

# Choice of images to build/push
ALL_DOCKER_BUILD ?= core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure in-memory-infrastructure test-extension clusterctl

Expand Down Expand Up @@ -1039,19 +1042,7 @@ release-binary: $(RELEASE_DIR)

.PHONY: release-staging
release-staging: ## Build and push container images to the staging bucket
REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all docker-push-all release-alias-tag

.PHONY: release-staging-build
release-staging-build: ## Build container images
REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all

.PHONY: release-staging-push
release-staging-push: ## Push container images to the staging bucket
REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-push-all


.PHONY: release-staging-alias
release-staging-alias: ## Add the release alias tag to the last staging build tag
REGISTRY=$(STAGING_REGISTRY) $(MAKE) release-alias-tag

.PHONY: release-staging-nightly
Expand Down Expand Up @@ -1100,8 +1091,8 @@ promote-images: $(KPROMO)
docker-push-all: $(addprefix docker-push-,$(ALL_ARCH)) ## Push the docker images to be included in the release for all architectures + related multiarch manifests
$(MAKE) ALL_ARCH="$(ALL_ARCH)" $(addprefix docker-push-manifest-,$(ALL_DOCKER_BUILD))

docker-push-%:
$(MAKE) ARCH=$* docker-push
# docker-push-%:
# $(MAKE) ARCH=$* docker-push

.PHONY: docker-push
docker-push: $(addprefix docker-push-,$(ALL_DOCKER_BUILD)) ## Push the docker images to be included in the release
Expand Down

0 comments on commit 2888de1

Please sign in to comment.