From a17039eae92a038a988557584774e950bbf6185b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 16 Jul 2019 13:32:08 -0700 Subject: [PATCH 1/2] Switch to the "latest-toolchain" packages --- 3.7-rc/alpine/Dockerfile | 2 +- 3.7-rc/ubuntu/Dockerfile | 2 +- 3.7/alpine/Dockerfile | 2 +- 3.7/ubuntu/Dockerfile | 2 +- 3.8-rc/alpine/Dockerfile | 2 +- 3.8-rc/ubuntu/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- Dockerfile-ubuntu.template | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/3.7-rc/alpine/Dockerfile b/3.7-rc/alpine/Dockerfile index 721fe60..e72e90c 100644 --- a/3.7-rc/alpine/Dockerfile +++ b/3.7-rc/alpine/Dockerfile @@ -193,7 +193,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/3.7-rc/ubuntu/Dockerfile b/3.7-rc/ubuntu/Dockerfile index dc0817d..c685e80 100644 --- a/3.7-rc/ubuntu/Dockerfile +++ b/3.7-rc/ubuntu/Dockerfile @@ -209,7 +209,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/3.7/alpine/Dockerfile b/3.7/alpine/Dockerfile index 335b0f6..6b3c86c 100644 --- a/3.7/alpine/Dockerfile +++ b/3.7/alpine/Dockerfile @@ -193,7 +193,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/3.7/ubuntu/Dockerfile b/3.7/ubuntu/Dockerfile index c57fd79..3b10906 100644 --- a/3.7/ubuntu/Dockerfile +++ b/3.7/ubuntu/Dockerfile @@ -209,7 +209,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/3.8-rc/alpine/Dockerfile b/3.8-rc/alpine/Dockerfile index be0ccca..35f6d18 100644 --- a/3.8-rc/alpine/Dockerfile +++ b/3.8-rc/alpine/Dockerfile @@ -193,7 +193,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/3.8-rc/ubuntu/Dockerfile b/3.8-rc/ubuntu/Dockerfile index 5e8c3ba..342dbf5 100644 --- a/3.8-rc/ubuntu/Dockerfile +++ b/3.8-rc/ubuntu/Dockerfile @@ -209,7 +209,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 f54ce0b..2a28889 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -193,7 +193,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/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template index 90fa6f3..276e751 100644 --- a/Dockerfile-ubuntu.template +++ b/Dockerfile-ubuntu.template @@ -209,7 +209,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"; \ From d38a86acf3433c51359bd6da62668588a4660e2b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 16 Jul 2019 13:35:58 -0700 Subject: [PATCH 2/2] Update RabbitMQ key fetch to keys.openpgp.org per https://github.com/docker-library/rabbitmq/pull/349#issuecomment-511955023 --- 3.7-rc/alpine/Dockerfile | 2 +- 3.7-rc/ubuntu/Dockerfile | 2 +- 3.7/alpine/Dockerfile | 2 +- 3.7/ubuntu/Dockerfile | 2 +- 3.8-rc/alpine/Dockerfile | 2 +- 3.8-rc/ubuntu/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- Dockerfile-ubuntu.template | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/3.7-rc/alpine/Dockerfile b/3.7-rc/alpine/Dockerfile index e72e90c..21ce383 100644 --- a/3.7-rc/alpine/Dockerfile +++ b/3.7-rc/alpine/Dockerfile @@ -200,7 +200,7 @@ RUN set -eux; \ wget --output-document "$RABBITMQ_PATH.tar.xz" "$RABBITMQ_SOURCE_URL"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ gpg --batch --verify "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_PATH.tar.xz"; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/3.7-rc/ubuntu/Dockerfile b/3.7-rc/ubuntu/Dockerfile index c685e80..0392f8f 100644 --- a/3.7-rc/ubuntu/Dockerfile +++ b/3.7-rc/ubuntu/Dockerfile @@ -216,7 +216,7 @@ RUN set -eux; \ wget --progress dot:giga --output-document "$RABBITMQ_PATH.tar.xz" "$RABBITMQ_SOURCE_URL"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ gpg --batch --verify "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_PATH.tar.xz"; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/3.7/alpine/Dockerfile b/3.7/alpine/Dockerfile index 6b3c86c..3d56a5a 100644 --- a/3.7/alpine/Dockerfile +++ b/3.7/alpine/Dockerfile @@ -200,7 +200,7 @@ RUN set -eux; \ wget --output-document "$RABBITMQ_PATH.tar.xz" "$RABBITMQ_SOURCE_URL"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ gpg --batch --verify "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_PATH.tar.xz"; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/3.7/ubuntu/Dockerfile b/3.7/ubuntu/Dockerfile index 3b10906..dcf02a8 100644 --- a/3.7/ubuntu/Dockerfile +++ b/3.7/ubuntu/Dockerfile @@ -216,7 +216,7 @@ RUN set -eux; \ wget --progress dot:giga --output-document "$RABBITMQ_PATH.tar.xz" "$RABBITMQ_SOURCE_URL"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ gpg --batch --verify "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_PATH.tar.xz"; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/3.8-rc/alpine/Dockerfile b/3.8-rc/alpine/Dockerfile index 35f6d18..6be28fc 100644 --- a/3.8-rc/alpine/Dockerfile +++ b/3.8-rc/alpine/Dockerfile @@ -200,7 +200,7 @@ RUN set -eux; \ wget --output-document "$RABBITMQ_PATH.tar.xz" "$RABBITMQ_SOURCE_URL"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ gpg --batch --verify "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_PATH.tar.xz"; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/3.8-rc/ubuntu/Dockerfile b/3.8-rc/ubuntu/Dockerfile index 342dbf5..766eb2f 100644 --- a/3.8-rc/ubuntu/Dockerfile +++ b/3.8-rc/ubuntu/Dockerfile @@ -216,7 +216,7 @@ RUN set -eux; \ wget --progress dot:giga --output-document "$RABBITMQ_PATH.tar.xz" "$RABBITMQ_SOURCE_URL"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ gpg --batch --verify "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_PATH.tar.xz"; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 2a28889..fd662fd 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -200,7 +200,7 @@ RUN set -eux; \ wget --output-document "$RABBITMQ_PATH.tar.xz" "$RABBITMQ_SOURCE_URL"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ gpg --batch --verify "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_PATH.tar.xz"; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template index 276e751..d1d1c0d 100644 --- a/Dockerfile-ubuntu.template +++ b/Dockerfile-ubuntu.template @@ -216,7 +216,7 @@ RUN set -eux; \ wget --progress dot:giga --output-document "$RABBITMQ_PATH.tar.xz" "$RABBITMQ_SOURCE_URL"; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$RABBITMQ_PGP_KEY_ID"; \ gpg --batch --verify "$RABBITMQ_PATH.tar.xz.asc" "$RABBITMQ_PATH.tar.xz"; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \