diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-02-23 09:34:25 +0100 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-02-23 11:26:29 +0100 |
| commit | 15e6beea2aa2aeb0d6d31776802f2a854e20a8a8 (patch) | |
| tree | 27b9c711f2b1f8867dbd8f88553b7bc074db3963 | |
| parent | b1eaf8c9e20bfe7068cafcccf73f7117fc0e196b (diff) | |
| download | rabbitmq-server-git-15e6beea2aa2aeb0d6d31776802f2a854e20a8a8.tar.gz | |
`make docker-image` no longer pushes the image by default
`make docker-image-push` maintains the previous behavior
| -rw-r--r-- | packaging/Makefile | 6 | ||||
| -rw-r--r-- | packaging/docker-image/Makefile | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/packaging/Makefile b/packaging/Makefile index ba6b66c1bf..47253dcb7f 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -40,7 +40,8 @@ all: packages package-rpm-suse package-rpm-opensuse package-rpm-sles11 \ package-windows \ package-generic-unix \ - docker-image + docker-image \ + docker-image-push PACKAGES_DIR ?= ../PACKAGES SOURCE_DIST_FILE ?= $(wildcard $(PACKAGES_DIR)/rabbitmq-server-*.tar.xz) @@ -112,6 +113,9 @@ package-generic-unix: $(SOURCE_DIST_FILE) docker-image: $(gen_verbose) $(MAKE) -C docker-image $(VARS) all $(DO_CLEAN) +docker-image-push: + $(gen_verbose) $(MAKE) -C docker-image $(VARS) push $(DO_CLEAN) + .PHONY: clean clean: diff --git a/packaging/docker-image/Makefile b/packaging/docker-image/Makefile index 81d3a6c92e..302b2d80f1 100644 --- a/packaging/docker-image/Makefile +++ b/packaging/docker-image/Makefile @@ -26,6 +26,8 @@ dist: --build-arg RABBITMQ_BUILD=rabbitmq_server-$(VERSION) \ --tag pivotalrabbitmq/rabbitmq:$(VERSION) \ . + +push: dist docker push pivotalrabbitmq/rabbitmq:$(VERSION) clean: |