diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2020-11-16 12:18:39 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2020-11-16 12:18:39 +0100 |
| commit | 4568ab0fb9c97643d79eb721d21091ef371917ff (patch) | |
| tree | daea945750777e74e18af9b01882640a31608af8 /Makefile | |
| parent | bec7d258b31c51693259876295934a9fb50c1cd3 (diff) | |
| download | rabbitmq-server-git-4568ab0fb9c97643d79eb721d21091ef371917ff.tar.gz | |
packaging/docker-image: Move Docker files to their own directory
Like other packaging files, they should not be part of RabbitMQ itself.
One day, they will probably be moved to a dedicated repository, like
other packaging files.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 4 insertions, 20 deletions
@@ -340,7 +340,8 @@ clean-unpacked-source-dist: .PHONY: packages package-deb \ package-rpm package-rpm-fedora package-rpm-suse \ package-windows \ - package-generic-unix + package-generic-unix \ + docker-image # This variable is exported so sub-make instances know where to find the # archive. @@ -350,28 +351,11 @@ packages package-deb package-rpm \ package-rpm-redhat package-rpm-fedora package-rpm-rhel6 package-rpm-rhel7 \ package-rpm-rhel8 package-rpm-suse package-rpm-opensuse package-rpm-sles11 \ package-windows \ -package-generic-unix: $(PACKAGES_SOURCE_DIST_FILE) +package-generic-unix \ +docker-image: $(PACKAGES_SOURCE_DIST_FILE) $(verbose) $(MAKE) -C packaging $@ \ SOURCE_DIST_FILE=$(abspath $(PACKAGES_SOURCE_DIST_FILE)) -$(PACKAGES_DIR)/rabbitmq-server-generic-unix-$(PROJECT_VERSION).tar.xz: - $(verbose) $(MAKE) package-generic-unix - -# Docker is different because we need to build & publish -OTP_VERSION := 22.3 -OTP_SHA256 := 886e6dbe1e4823c7e8d9c9c1ba8315075a1a9f7717f5a1eaf3b98345ca6c798e -docker-image: $(PACKAGES_DIR)/rabbitmq-server-generic-unix-$(PROJECT_VERSION).tar.xz - $(verbose) (cd PACKAGES && tar xJvf rabbitmq-server-generic-unix-$(PROJECT_VERSION).tar.xz) \ - && 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=$(PROJECT_VERSION) \ - --build-arg RABBITMQ_BUILD=PACKAGES/rabbitmq_server-$(PROJECT_VERSION) \ - --tag pivotalrabbitmq/rabbitmq:$(PROJECT_VERSION) \ - . \ - && docker push pivotalrabbitmq/rabbitmq:$(PROJECT_VERSION) - # -------------------------------------------------------------------- # Installation. # -------------------------------------------------------------------- |