@@ -432,9 +432,9 @@ release-build: release-prereqs clean
432
432
ifneq ($(VERSION ) , $(GIT_VERSION ) )
433
433
$(error Attempt to build $(VERSION) from $(GIT_VERSION))
434
434
endif
435
- $(MAKE) image
436
- $(MAKE) tag-images IMAGETAG=$(VERSION)
437
- $(MAKE) tag-images IMAGETAG=latest
435
+ $(MAKE) image-all
436
+ $(MAKE) tag-images-all IMAGETAG=$(VERSION)
437
+ $(MAKE) tag-images-all IMAGETAG=latest
438
438
439
439
# # Verifies the release artifacts produces by `make release-build` are correct.
440
440
release-verify : release-prereqs
@@ -457,7 +457,7 @@ release-publish: release-prereqs
457
457
git push origin $(VERSION )
458
458
459
459
# Push images.
460
- $(MAKE) push RELEASE=true IMAGETAG=$(VERSION) ARCH=$(ARCH )
460
+ $(MAKE) push-all RELEASE=true IMAGETAG=$(VERSION)
461
461
462
462
@echo "Finalize the GitHub release based on the pushed tag."
463
463
@echo "Attach the $(DIST)/calico-typha-amd64 binary."
@@ -477,7 +477,7 @@ release-publish-latest: release-prereqs
477
477
if ! docker run $( BUILD_IMAGE) :latest-$( ARCH) calico-typha --version | grep ' $(VERSION)' ; then echo " Reported version:" ` docker run $( BUILD_IMAGE) :latest-$( ARCH) calico-typha --version` " \nExpected version: $( VERSION) " ; false ; else echo " \nVersion check passed\n" ; fi
478
478
if ! docker run quay.io/$( BUILD_IMAGE) :latest-$( ARCH) calico-typha --version | grep ' $(VERSION)' ; then echo " Reported version:" ` docker run quay.io/$( BUILD_IMAGE) :latest-$( ARCH) calico-typha --version` " \nExpected version: $( VERSION) " ; false ; else echo " \nVersion check passed\n" ; fi
479
479
480
- $(MAKE) push RELEASE=true IMAGETAG=latest ARCH=$(ARCH)
480
+ $(MAKE) push-all RELEASE=true IMAGETAG=latest
481
481
482
482
# release-prereqs checks that the environment is configured properly to create a release.
483
483
release-prereqs :
0 commit comments