Skip to content

Commit

Permalink
Change release repo to docker.io, add RELEASE and CONFIRM env variabl…
Browse files Browse the repository at this point in the history
…es (#2396)
  • Loading branch information
Brian-McM authored Aug 16, 2021
1 parent 9fbe3c1 commit 0e555ea
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ endif

CALICOCTL_IMAGE ?=calico/ctl
BUILD_IMAGES ?=$(CALICOCTL_IMAGE)
DEV_REGISTRIES ?=quay.io registry.hub.docker.com
DEV_REGISTRIES ?=quay.io docker.io
RELEASE_REGISTRIES ?= $(DEV_REGISTRIES)
RELEASE_BRANCH_PREFIX ?= release
DEV_TAG_SUFFIX ?= 0.dev
Expand Down Expand Up @@ -379,7 +379,7 @@ release-publish: release-prereqs
git push origin $(VERSION)

# Push images.
$(MAKE) push-images-to-registries push-manifests IMAGETAG=$(VERSION)
$(MAKE) push-images-to-registries push-manifests IMAGETAG=$(VERSION) RELEASE=true CONFIRM=true

# Push binaries to GitHub release.
# Requires ghr: https://github.com/tcnksm/ghr
Expand Down Expand Up @@ -410,7 +410,7 @@ release-publish-latest: release-prereqs
echo "Version check passed\n"; \
fi

$(MAKE) push-images-to-registries push-manifests IMAGETAG=latest
$(MAKE) push-images-to-registries push-manifests IMAGETAG=latest RELEASE=true CONFIRM=true

# release-prereqs checks that the environment is configured properly to create a release.
release-prereqs:
Expand Down

0 comments on commit 0e555ea

Please sign in to comment.