From 0031331f4d3e8e1305087c9423ffa9afb610b99b Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Fri, 19 Apr 2024 14:11:09 +0200 Subject: [PATCH 1/2] Use generic-unix tar.xz artifact in dockerfile --- packaging/docker-image/Dockerfile | 5 +++-- packaging/docker-image/Makefile | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packaging/docker-image/Dockerfile b/packaging/docker-image/Dockerfile index d2d104d65075..a80e9b105794 100644 --- a/packaging/docker-image/Dockerfile +++ b/packaging/docker-image/Dockerfile @@ -10,13 +10,14 @@ ENV RABBITMQ_DATA_DIR /var/lib/rabbitmq # Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html) ARG RABBITMQ_VERSION=4.0.0 +ARG RABBITMQ_BUILD ENV RABBITMQ_VERSION=${RABBITMQ_VERSION} ENV RABBITMQ_HOME /opt/rabbitmq # Add RabbitMQ to PATH ENV PATH $RABBITMQ_HOME/sbin:$PATH -COPY package-generic-unix.tar.xz /usr/local/src/rabbitmq-$RABBITMQ_VERSION.tar.xz +COPY ${RABBITMQ_BUILD}.tar.xz /usr/local/src/rabbitmq-$RABBITMQ_VERSION.tar.xz # Install RabbitMQ RUN set -eux; \ @@ -106,4 +107,4 @@ RUN set eux; \ rm -rf /var/lib/apt/lists/*; \ rabbitmqadmin --version -EXPOSE 15671 15672 \ No newline at end of file +EXPOSE 15671 15672 diff --git a/packaging/docker-image/Makefile b/packaging/docker-image/Makefile index 6e82080b6057..c964c6f679c7 100644 --- a/packaging/docker-image/Makefile +++ b/packaging/docker-image/Makefile @@ -45,6 +45,7 @@ ALT2_PGP_KEYSERVER ?= pgpkeys.uk all: dist dist: + cp $(GENERIC_UNIX_ARCHIVE) rabbitmq_server-$(VERSION).tar.xz xzcat $(GENERIC_UNIX_ARCHIVE) | tar xvf - docker build --pull \ --build-arg SKIP_PGP_VERIFY=$(SKIP_PGP_VERIFY) \ From bcaa2e364748ae95292e50f68dca3b1d3a00eeda Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Fri, 19 Apr 2024 14:50:27 +0200 Subject: [PATCH 2/2] Fix issue which broke bazel the dockerfile is used by bazel and make --- packaging/docker-image/Dockerfile | 3 +-- packaging/docker-image/Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packaging/docker-image/Dockerfile b/packaging/docker-image/Dockerfile index a80e9b105794..bd5de32de43e 100644 --- a/packaging/docker-image/Dockerfile +++ b/packaging/docker-image/Dockerfile @@ -10,14 +10,13 @@ ENV RABBITMQ_DATA_DIR /var/lib/rabbitmq # Use the latest stable RabbitMQ release (https://www.rabbitmq.com/download.html) ARG RABBITMQ_VERSION=4.0.0 -ARG RABBITMQ_BUILD ENV RABBITMQ_VERSION=${RABBITMQ_VERSION} ENV RABBITMQ_HOME /opt/rabbitmq # Add RabbitMQ to PATH ENV PATH $RABBITMQ_HOME/sbin:$PATH -COPY ${RABBITMQ_BUILD}.tar.xz /usr/local/src/rabbitmq-$RABBITMQ_VERSION.tar.xz +COPY package-generic-unix.tar.xz /usr/local/src/rabbitmq-$RABBITMQ_VERSION.tar.xz # Install RabbitMQ RUN set -eux; \ diff --git a/packaging/docker-image/Makefile b/packaging/docker-image/Makefile index c964c6f679c7..548100632a06 100644 --- a/packaging/docker-image/Makefile +++ b/packaging/docker-image/Makefile @@ -45,7 +45,7 @@ ALT2_PGP_KEYSERVER ?= pgpkeys.uk all: dist dist: - cp $(GENERIC_UNIX_ARCHIVE) rabbitmq_server-$(VERSION).tar.xz + cp $(GENERIC_UNIX_ARCHIVE) package-generic-unix.tar.xz xzcat $(GENERIC_UNIX_ARCHIVE) | tar xvf - docker build --pull \ --build-arg SKIP_PGP_VERIFY=$(SKIP_PGP_VERIFY) \