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 #7747

Merged
merged 1 commit into from
Apr 8, 2020
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Apr 6, 2020

Changes:

Changes:

- docker-library/rabbitmq@7219c8e: Update to 3.7.24, Erlang/OTP 22.3.1, OpenSSL 1.1.1f
- docker-library/rabbitmq@e4c53d5: Update to 3.8.3, Erlang/OTP 22.3.1, OpenSSL 1.1.1f
@tianon
Copy link
Member Author

tianon commented Apr 6, 2020

Diff:
diff --git a/rabbitmq_3.7-alpine/Dockerfile b/rabbitmq_3.7-alpine/Dockerfile
index 91ac4b3..ef0ffb9 100644
--- a/rabbitmq_3.7-alpine/Dockerfile
+++ b/rabbitmq_3.7-alpine/Dockerfile
@@ -22,10 +22,10 @@ ENV OPENSSL_SOURCE_SHA256="186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b6
 ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
 
 # Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
-ENV OTP_VERSION 22.3
+ENV OTP_VERSION 22.3.1
 # 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
-ENV OTP_SOURCE_SHA256="886e6dbe1e4823c7e8d9c9c1ba8315075a1a9f7717f5a1eaf3b98345ca6c798e"
+ENV OTP_SOURCE_SHA256="34677d4604b6357db03b6cf79226d9fc1bbdf0ecb5e7545f2fe7a834cec93a83"
 
 # Install dependencies required to build Erlang/OTP from source
 # http://erlang.org/doc/installation_guide/INSTALL.html
diff --git a/rabbitmq_3.7/Dockerfile b/rabbitmq_3.7/Dockerfile
index c766835..8243f12 100644
--- a/rabbitmq_3.7/Dockerfile
+++ b/rabbitmq_3.7/Dockerfile
@@ -25,10 +25,10 @@ ENV OPENSSL_SOURCE_SHA256="186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b6
 ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
 
 # Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
-ENV OTP_VERSION 22.3
+ENV OTP_VERSION 22.3.1
 # 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
-ENV OTP_SOURCE_SHA256="886e6dbe1e4823c7e8d9c9c1ba8315075a1a9f7717f5a1eaf3b98345ca6c798e"
+ENV OTP_SOURCE_SHA256="34677d4604b6357db03b6cf79226d9fc1bbdf0ecb5e7545f2fe7a834cec93a83"
 
 # Install dependencies required to build Erlang/OTP from source
 # http://erlang.org/doc/installation_guide/INSTALL.html
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 7b046be..b6634e7 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -22,10 +22,10 @@ ENV OPENSSL_SOURCE_SHA256="186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b6
 ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
 
 # Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
-ENV OTP_VERSION 22.3
+ENV OTP_VERSION 22.3.1
 # 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
-ENV OTP_SOURCE_SHA256="886e6dbe1e4823c7e8d9c9c1ba8315075a1a9f7717f5a1eaf3b98345ca6c798e"
+ENV OTP_SOURCE_SHA256="34677d4604b6357db03b6cf79226d9fc1bbdf0ecb5e7545f2fe7a834cec93a83"
 
 # Install dependencies required to build Erlang/OTP from source
 # http://erlang.org/doc/installation_guide/INSTALL.html
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index be98b78..a49faa9 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -25,10 +25,10 @@ ENV OPENSSL_SOURCE_SHA256="186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b6
 ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0x5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33 0xED230BEC4D4F2518B9D7DF41F0DB4D21C1D35231 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
 
 # Use the latest stable Erlang/OTP release (https://github.com/erlang/otp/tags)
-ENV OTP_VERSION 22.3
+ENV OTP_VERSION 22.3.1
 # 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
-ENV OTP_SOURCE_SHA256="886e6dbe1e4823c7e8d9c9c1ba8315075a1a9f7717f5a1eaf3b98345ca6c798e"
+ENV OTP_SOURCE_SHA256="34677d4604b6357db03b6cf79226d9fc1bbdf0ecb5e7545f2fe7a834cec93a83"
 
 # Install dependencies required to build Erlang/OTP from source
 # http://erlang.org/doc/installation_guide/INSTALL.html

@tianon
Copy link
Member Author

tianon commented Apr 6, 2020

Build test of #7747; 77bc3c8; amd64 (rabbitmq):

$ bashbrew build rabbitmq:3.8.3
Building bashbrew/cache:40793ad4e98601e036e0e5d8d84cecb0055d587d031ecdc9c089b4cfbac0f585 (rabbitmq:3.8.3)
Tagging rabbitmq:3.8.3
Tagging rabbitmq:3.8
Tagging rabbitmq:3
Tagging rabbitmq:latest

$ test/run.sh rabbitmq:3.8.3
testing rabbitmq:3.8.3
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'rabbitmq-basics' [5/6]......passed
	'rabbitmq-tls' [6/6].....passed


$ bashbrew build rabbitmq:3.8.3-management
Building bashbrew/cache:7d5698cb113b9b6658d62b53063135432be789797240f6fd24b995c842773421 (rabbitmq:3.8.3-management)
Tagging rabbitmq:3.8.3-management
Tagging rabbitmq:3.8-management
Tagging rabbitmq:3-management
Tagging rabbitmq:management

$ test/run.sh rabbitmq:3.8.3-management
testing rabbitmq:3.8.3-management
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'rabbitmq-basics' [5/6]......passed
	'rabbitmq-tls' [6/6].....passed


$ bashbrew build rabbitmq:3.8.3-alpine
Building bashbrew/cache:3adb754c23686dd1e71551b7aae9dfe215f5692d7c7658124649714fcc66e6b8 (rabbitmq:3.8.3-alpine)
Tagging rabbitmq:3.8.3-alpine
Tagging rabbitmq:3.8-alpine
Tagging rabbitmq:3-alpine
Tagging rabbitmq:alpine

$ test/run.sh rabbitmq:3.8.3-alpine
testing rabbitmq:3.8.3-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'rabbitmq-basics' [5/6]......passed
	'rabbitmq-tls' [6/6].....passed


$ bashbrew build rabbitmq:3.8.3-management-alpine
Building bashbrew/cache:4ffb16617fae80b8c08d89f2e9e759421c06d35cf6e621807daace7af214a6c5 (rabbitmq:3.8.3-management-alpine)
Tagging rabbitmq:3.8.3-management-alpine
Tagging rabbitmq:3.8-management-alpine
Tagging rabbitmq:3-management-alpine
Tagging rabbitmq:management-alpine

$ test/run.sh rabbitmq:3.8.3-management-alpine
testing rabbitmq:3.8.3-management-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'rabbitmq-basics' [5/6].......passed
	'rabbitmq-tls' [6/6].....passed


$ bashbrew build rabbitmq:3.7.24
Building bashbrew/cache:2010c200cba992f63ce10a4951c1d08ea35b8b22cd106dae144d2b2cf009e989 (rabbitmq:3.7.24)
Tagging rabbitmq:3.7.24
Tagging rabbitmq:3.7

$ test/run.sh rabbitmq:3.7.24
testing rabbitmq:3.7.24
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'rabbitmq-basics' [5/6].....passed
	'rabbitmq-tls' [6/6]....passed


$ bashbrew build rabbitmq:3.7.24-management
Building bashbrew/cache:f0cb97e708460b97ea300d72c400228dcc5d863f3df1d119824dccb52f1747a9 (rabbitmq:3.7.24-management)
Tagging rabbitmq:3.7.24-management
Tagging rabbitmq:3.7-management

$ test/run.sh rabbitmq:3.7.24-management
testing rabbitmq:3.7.24-management
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'rabbitmq-basics' [5/6].....passed
	'rabbitmq-tls' [6/6]....passed


$ bashbrew build rabbitmq:3.7.24-alpine
Building bashbrew/cache:93562af1713d35da7b911b8ed0795e3642e721bb9197c4dbcb43b3e7ff01369b (rabbitmq:3.7.24-alpine)
Tagging rabbitmq:3.7.24-alpine
Tagging rabbitmq:3.7-alpine

$ test/run.sh rabbitmq:3.7.24-alpine
testing rabbitmq:3.7.24-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'rabbitmq-basics' [5/6].....passed
	'rabbitmq-tls' [6/6]....passed


$ bashbrew build rabbitmq:3.7.24-management-alpine
Building bashbrew/cache:e5724ae655e7c9c6d352b0ea50b61867ca2b62b883ea0ff4721b295d1f4462e1 (rabbitmq:3.7.24-management-alpine)
Tagging rabbitmq:3.7.24-management-alpine
Tagging rabbitmq:3.7-management-alpine

$ test/run.sh rabbitmq:3.7.24-management-alpine
testing rabbitmq:3.7.24-management-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'rabbitmq-basics' [5/6]......passed
	'rabbitmq-tls' [6/6].....passed

@tianon tianon merged commit f476f1e into docker-library:master Apr 8, 2020
@tianon tianon deleted the rabbitmq branch April 8, 2020 20:25
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.

2 participants