Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rabbitmq #9550

Merged
merged 1 commit into from
Feb 2, 2021
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Feb 2, 2021

Changes:

Changes:

- docker-library/rabbitmq@2ee8b3b: Merge pull request docker-library/rabbitmq#461 from J0WI/alpine-3.13
@github-actions
Copy link

github-actions bot commented Feb 2, 2021

Diff for 8680548:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7671987..fd238ab 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,12 +3,12 @@ GitRepo: https://github.com/docker-library/rabbitmq.git
 
 Tags: 3.8.11, 3.8, 3, latest
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8622e40c638f26a8f3bd9f04cf5be104605bf6b6
+GitCommit: 6d24429a1a07f6fe71b74b59712ec9cd5e6d7b79
 Directory: 3.8/ubuntu
 
 Tags: 3.8.11-alpine, 3.8-alpine, 3-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8622e40c638f26a8f3bd9f04cf5be104605bf6b6
+GitCommit: 6d24429a1a07f6fe71b74b59712ec9cd5e6d7b79
 Directory: 3.8/alpine
 
 Tags: 3.8.11-management, 3.8-management, 3-management, management
@@ -23,12 +23,12 @@ Directory: 3.8/alpine/management
 
 Tags: 3.8.12-beta.1, 3.8-rc
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 472f9f92501efc8678fdb62944905e9c2b9d5167
+GitCommit: 2ee8b3bdeefbea1544326ccf2aadf1ae067659b1
 Directory: 3.8-rc/ubuntu
 
 Tags: 3.8.12-beta.1-alpine, 3.8-rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 472f9f92501efc8678fdb62944905e9c2b9d5167
+GitCommit: 2ee8b3bdeefbea1544326ccf2aadf1ae067659b1
 Directory: 3.8-rc/alpine
 
 Tags: 3.8.12-beta.1-management, 3.8-rc-management
diff --git a/rabbitmq_3.8-rc-alpine/Dockerfile b/rabbitmq_3.8-rc-alpine/Dockerfile
index c95d903..9b71715 100644
--- a/rabbitmq_3.8-rc-alpine/Dockerfile
+++ b/rabbitmq_3.8-rc-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.12
+FROM alpine:3.13
 
 RUN apk add --no-cache \
 # grab su-exec for easy step-down from root
@@ -28,11 +28,11 @@ ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB2
 
 ENV OTP_VERSION 23.2.3
 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system
-# http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
+# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
 ENV OTP_SOURCE_SHA256="d978ea01def07d2533cba3277b27cad9640589f36e39582fdeed0966b471bf3f"
 
 # Install dependencies required to build Erlang/OTP from source
-# http://erlang.org/doc/installation_guide/INSTALL.html
+# https://erlang.org/doc/installation_guide/INSTALL.html
 # autoconf: Required to configure Erlang/OTP before compiling
 # dpkg-dev: Required to set up host & build type when compiling Erlang/OTP
 # gnupg: Required to verify OpenSSL artefacts
@@ -104,7 +104,7 @@ RUN set -eux; \
 	tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
 	\
 # Configure Erlang/OTP for compilation, disable unused features & applications
-# http://erlang.org/doc/applications.html
+# https://erlang.org/doc/applications.html
 # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation
 	cd "$OTP_PATH"; \
 	export ERL_TOP="$OTP_PATH"; \
diff --git a/rabbitmq_3.8-rc/Dockerfile b/rabbitmq_3.8-rc/Dockerfile
index 5fd40c1..60449ec 100644
--- a/rabbitmq_3.8-rc/Dockerfile
+++ b/rabbitmq_3.8-rc/Dockerfile
@@ -31,11 +31,11 @@ ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB2
 
 ENV OTP_VERSION 23.2.3
 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system
-# http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
+# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
 ENV OTP_SOURCE_SHA256="d978ea01def07d2533cba3277b27cad9640589f36e39582fdeed0966b471bf3f"
 
 # Install dependencies required to build Erlang/OTP from source
-# http://erlang.org/doc/installation_guide/INSTALL.html
+# https://erlang.org/doc/installation_guide/INSTALL.html
 # autoconf: Required to configure Erlang/OTP before compiling
 # dpkg-dev: Required to set up host & build type when compiling Erlang/OTP
 # gnupg: Required to verify OpenSSL artefacts
@@ -111,7 +111,7 @@ RUN set -eux; \
 	tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
 	\
 # Configure Erlang/OTP for compilation, disable unused features & applications
-# http://erlang.org/doc/applications.html
+# https://erlang.org/doc/applications.html
 # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation
 	cd "$OTP_PATH"; \
 	export ERL_TOP="$OTP_PATH"; \
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 0511556..23a9a70 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
-FROM alpine:3.12
+FROM alpine:3.13
 
 RUN apk add --no-cache \
 # grab su-exec for easy step-down from root
@@ -28,11 +28,11 @@ ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB2
 
 ENV OTP_VERSION 23.2.3
 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system
-# http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
+# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
 ENV OTP_SOURCE_SHA256="d978ea01def07d2533cba3277b27cad9640589f36e39582fdeed0966b471bf3f"
 
 # Install dependencies required to build Erlang/OTP from source
-# http://erlang.org/doc/installation_guide/INSTALL.html
+# https://erlang.org/doc/installation_guide/INSTALL.html
 # autoconf: Required to configure Erlang/OTP before compiling
 # dpkg-dev: Required to set up host & build type when compiling Erlang/OTP
 # gnupg: Required to verify OpenSSL artefacts
@@ -104,7 +104,7 @@ RUN set -eux; \
 	tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
 	\
 # Configure Erlang/OTP for compilation, disable unused features & applications
-# http://erlang.org/doc/applications.html
+# https://erlang.org/doc/applications.html
 # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation
 	cd "$OTP_PATH"; \
 	export ERL_TOP="$OTP_PATH"; \
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index 3706127..338ee8e 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -31,11 +31,11 @@ ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB2
 
 ENV OTP_VERSION 23.2.3
 # TODO add PGP checking when the feature will be added to Erlang/OTP's build system
-# http://erlang.org/pipermail/erlang-questions/2019-January/097067.html
+# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
 ENV OTP_SOURCE_SHA256="d978ea01def07d2533cba3277b27cad9640589f36e39582fdeed0966b471bf3f"
 
 # Install dependencies required to build Erlang/OTP from source
-# http://erlang.org/doc/installation_guide/INSTALL.html
+# https://erlang.org/doc/installation_guide/INSTALL.html
 # autoconf: Required to configure Erlang/OTP before compiling
 # dpkg-dev: Required to set up host & build type when compiling Erlang/OTP
 # gnupg: Required to verify OpenSSL artefacts
@@ -111,7 +111,7 @@ RUN set -eux; \
 	tar --extract --file "$OTP_PATH.tar.gz" --directory "$OTP_PATH" --strip-components 1; \
 	\
 # Configure Erlang/OTP for compilation, disable unused features & applications
-# http://erlang.org/doc/applications.html
+# https://erlang.org/doc/applications.html
 # ERL_TOP is required for Erlang/OTP makefiles to find the absolute path for the installation
 	cd "$OTP_PATH"; \
 	export ERL_TOP="$OTP_PATH"; \

@yosifkit yosifkit merged commit c8fd282 into docker-library:master Feb 2, 2021
@yosifkit yosifkit deleted the rabbitmq branch February 2, 2021 01:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants