Merge pull request #743 from infosiftr/latest-toolchain

Use the "latest-toolchain" packages consistently
docker-library · Nov 25, 2024 · f950b28 · f950b28
2 parents 7c74b3a + 0d7a331
commit f950b28
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/4.1-rc/alpine/Dockerfile b/4.1-rc/alpine/Dockerfile
diff --git a/4.1-rc/ubuntu/Dockerfile b/4.1-rc/ubuntu/Dockerfile
diff --git 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
@@ -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"; \