From 0d7a331c694a5f32ccf94837894d9e4eb529940f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 25 Nov 2024 11:21:52 -0800 Subject: [PATCH] Use the "latest-toolchain" packages consistently --- 4.1-rc/alpine/Dockerfile | 2 +- 4.1-rc/ubuntu/Dockerfile | 2 +- Dockerfile-alpine.template | 4 ---- Dockerfile-ubuntu.template | 4 ---- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/4.1-rc/alpine/Dockerfile b/4.1-rc/alpine/Dockerfile index ab577521..bc3aafd9 100644 --- a/4.1-rc/alpine/Dockerfile +++ b/4.1-rc/alpine/Dockerfile @@ -267,7 +267,7 @@ RUN set -eux; \ xz \ ; \ \ - RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-$RABBITMQ_VERSION.tar.xz"; \ + RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-latest-toolchain-$RABBITMQ_VERSION.tar.xz"; \ RABBITMQ_PATH="/usr/local/src/rabbitmq-$RABBITMQ_VERSION"; \ \ wget --output-document "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_SOURCE_URL.asc"; \ diff --git a/4.1-rc/ubuntu/Dockerfile b/4.1-rc/ubuntu/Dockerfile index 668689d5..c88298ba 100644 --- a/4.1-rc/ubuntu/Dockerfile +++ b/4.1-rc/ubuntu/Dockerfile @@ -259,7 +259,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-$RABBITMQ_VERSION.tar.xz"; \ + RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-latest-toolchain-$RABBITMQ_VERSION.tar.xz"; \ RABBITMQ_PATH="/usr/local/src/rabbitmq-$RABBITMQ_VERSION"; \ \ wget --progress dot:giga --output-document "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_SOURCE_URL.asc"; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 06b3ac24..cb0b8c49 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -274,11 +274,7 @@ RUN set -eux; \ xz \ ; \ \ -{{ if env.version | IN("3.13", "4.0") then ( -}} RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-latest-toolchain-$RABBITMQ_VERSION.tar.xz"; \ -{{ ) else ( -}} - RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-$RABBITMQ_VERSION.tar.xz"; \ -{{ ) end -}} RABBITMQ_PATH="/usr/local/src/rabbitmq-$RABBITMQ_VERSION"; \ \ wget --output-document "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_SOURCE_URL.asc"; \ diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template index 3965d413..9f9b0747 100644 --- a/Dockerfile-ubuntu.template +++ b/Dockerfile-ubuntu.template @@ -275,11 +275,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ -{{ if env.version | IN("3.13", "4.0") then ( -}} RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-latest-toolchain-$RABBITMQ_VERSION.tar.xz"; \ -{{ ) else ( -}} - RABBITMQ_SOURCE_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/v$RABBITMQ_VERSION/rabbitmq-server-generic-unix-$RABBITMQ_VERSION.tar.xz"; \ -{{ ) end -}} RABBITMQ_PATH="/usr/local/src/rabbitmq-$RABBITMQ_VERSION"; \ \ wget --progress dot:giga --output-document "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_SOURCE_URL.asc"; \