diff options
| author | Gerhard Lazu <gerhard@lazu.co.uk> | 2021-02-12 14:18:44 +0000 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-02-23 11:26:29 +0100 |
| commit | 4f0973620d3b9f886f5a4d664b32f03926f44f17 (patch) | |
| tree | 67bf2d3aa533ec6f222251ff251e512d7d552d81 | |
| parent | a937c6c7c7dc00f08a7138058cbfd2356c274070 (diff) | |
| download | rabbitmq-server-git-4f0973620d3b9f886f5a4d664b32f03926f44f17.tar.gz | |
Build the docker image, don't just echo
Also, don't depend on package-generic-unix, otherwise that will be
re-built every time we want to build the docker image, which is
unnecessary. It will fail now if a generic-unix doesn't exist, but
that's OK.
Signed-off-by: Gerhard Lazu <gerhard@lazu.co.uk>
| -rw-r--r-- | packaging/Makefile | 2 | ||||
| -rw-r--r-- | packaging/docker-image/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packaging/Makefile b/packaging/Makefile index ab656cfaab..ba6b66c1bf 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -109,7 +109,7 @@ package-windows: $(SOURCE_DIST_FILE) package-generic-unix: $(SOURCE_DIST_FILE) $(gen_verbose) $(MAKE) -C generic-unix $(VARS) all $(DO_CLEAN) -docker-image: package-generic-unix +docker-image: $(gen_verbose) $(MAKE) -C docker-image $(VARS) all $(DO_CLEAN) .PHONY: clean diff --git a/packaging/docker-image/Makefile b/packaging/docker-image/Makefile index f0d2a88d30..e527d37df8 100644 --- a/packaging/docker-image/Makefile +++ b/packaging/docker-image/Makefile @@ -21,15 +21,15 @@ all: dist dist: xzcat $(GENERIC_UNIX_ARCHIVE) | tar xvf - - echo docker build --pull \ + docker build --pull \ --build-arg PGP_KEYSERVER=pgpkeys.uk \ --build-arg OTP_VERSION=$(OTP_VERSION) \ --build-arg OTP_SHA256=$(OTP_SHA256) \ --build-arg RABBITMQ_VERSION=$(VERSION) \ --build-arg RABBITMQ_BUILD=rabbitmq_server-$(VERSION) \ --tag pivotalrabbitmq/rabbitmq:$(VERSION) \ - . \ - && docker push pivotalrabbitmq/rabbitmq:$(VERSION) + . + docker push pivotalrabbitmq/rabbitmq:$(VERSION) clean: rm -rf rabbitmq_server-* |