Update rabbitmq #15124
Merged
Update rabbitmq #15124
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/rabbitmq@ffecd69: Merge pull request docker-library/rabbitmq#657 from infosiftr/i386-arm32 - docker-library/rabbitmq@23170d7: Fix OpenSSL platform detection, especially for 32bit arches - docker-library/rabbitmq@0720727: Update 3.9 to otp 25.3.2.5 - docker-library/rabbitmq@a52f4d1: Update 3.12 to otp 25.3.2.5 - docker-library/rabbitmq@ccccce7: Update 3.11 to otp 25.3.2.5 - docker-library/rabbitmq@8ce2bd3: Update 3.10 to otp 25.3.2.5
Diff for 87b0f0d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e488861..b89e09b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,12 +4,12 @@ Builder: buildkit
Tags: 3.9.29, 3.9
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: cf4610a0eb5bc0c5ee89d31badb0c6887f478c9d
+GitCommit: 23170d74456dd7ab117f39fd46fc21a7e826f577
Directory: 3.9/ubuntu
Tags: 3.9.29-alpine, 3.9-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: cf4610a0eb5bc0c5ee89d31badb0c6887f478c9d
+GitCommit: 23170d74456dd7ab117f39fd46fc21a7e826f577
Directory: 3.9/alpine
Tags: 3.9.29-management, 3.9-management
@@ -24,12 +24,12 @@ Directory: 3.9/alpine/management
Tags: 3.10.25, 3.10
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 055e60ff8d72e2a920926388cfc79444e7d358d3
+GitCommit: 23170d74456dd7ab117f39fd46fc21a7e826f577
Directory: 3.10/ubuntu
Tags: 3.10.25-alpine, 3.10-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 055e60ff8d72e2a920926388cfc79444e7d358d3
+GitCommit: 23170d74456dd7ab117f39fd46fc21a7e826f577
Directory: 3.10/alpine
Tags: 3.10.25-management, 3.10-management
@@ -44,12 +44,12 @@ Directory: 3.10/alpine/management
Tags: 3.11.20, 3.11
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a6ecfb64ec6abe19f03c28ad3bc2784edb450c63
+GitCommit: 23170d74456dd7ab117f39fd46fc21a7e826f577
Directory: 3.11/ubuntu
Tags: 3.11.20-alpine, 3.11-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a6ecfb64ec6abe19f03c28ad3bc2784edb450c63
+GitCommit: 23170d74456dd7ab117f39fd46fc21a7e826f577
Directory: 3.11/alpine
Tags: 3.11.20-management, 3.11-management
@@ -64,12 +64,12 @@ Directory: 3.11/alpine/management
Tags: 3.12.2, 3.12, 3, latest
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 0eaef730173758725c5f7c60c11e8dd319a5255a
+GitCommit: 23170d74456dd7ab117f39fd46fc21a7e826f577
Directory: 3.12/ubuntu
Tags: 3.12.2-alpine, 3.12-alpine, 3-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0eaef730173758725c5f7c60c11e8dd319a5255a
+GitCommit: 23170d74456dd7ab117f39fd46fc21a7e826f577
Directory: 3.12/alpine
Tags: 3.12.2-management, 3.12-management, 3-management, management
@@ -84,12 +84,12 @@ Directory: 3.12/alpine/management
Tags: 3.13.0-beta.3, 3.13-rc
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ffef74ec93c905f714e91dc412dcf0905e3a6429
+GitCommit: 23170d74456dd7ab117f39fd46fc21a7e826f577
Directory: 3.13-rc/ubuntu
Tags: 3.13.0-beta.3-alpine, 3.13-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ffef74ec93c905f714e91dc412dcf0905e3a6429
+GitCommit: 23170d74456dd7ab117f39fd46fc21a7e826f577
Directory: 3.13-rc/alpine
Tags: 3.13.0-beta.3-management, 3.13-rc-management
diff --git a/rabbitmq_3.10-alpine/Dockerfile b/rabbitmq_3.10-alpine/Dockerfile
index 2f0e1bf..97626c6 100644
--- a/rabbitmq_3.10-alpine/Dockerfile
+++ b/rabbitmq_3.10-alpine/Dockerfile
@@ -29,10 +29,10 @@ ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-ENV OTP_VERSION 25.3.2.4
+ENV OTP_VERSION 25.3.2.5
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="9d224c098abbb48fbe42abb81bd04765efa2190d9eae4898f78183d9725a676b"
+ENV OTP_SOURCE_SHA256="1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db"
# Install dependencies required to build Erlang/OTP from source
# https://erlang.org/doc/installation_guide/INSTALL.html
@@ -64,16 +64,33 @@ RUN set -eux; \
# Configure OpenSSL for compilation
cd "$OPENSSL_PATH"; \
# OpenSSL's "config" script uses a lot of "uname"-based target detection...
- MACHINE="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" \
+ apkArch="$(apk --print-arch)"; \
+# https://dl-cdn.alpinelinux.org/alpine/edge/main/
+ case "$apkArch" in \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+ aarch64) opensslMachine='linux-aarch64' ;; \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L736-L766
+ armhf) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv6' ;; \
+ armv7) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv7-a' ;; \
+ ppc64le) opensslMachine='linux-ppc64le' ;; \
+ riscv64) opensslMachine='linux64-riscv64' ;; \
+ s390x) opensslMachine='linux64-s390x' ;; \
+ x86) opensslMachine='linux-x86' ;; \
+ x86_64) opensslMachine='linux-x86_64' ;; \
+ *) echo >&2 "error: unsupported arch: '$apkArch'"; exit 1 ;; \
+ esac; \
+ MACHINE="$opensslMachine" \
RELEASE="4.x.y-z" \
SYSTEM='Linux' \
BUILD='???' \
- ./config \
+ ./Configure \
+ "$opensslMachine" \
enable-fips \
--openssldir="$OPENSSL_CONFIG_DIR" \
--libdir=/usr/local/lib \
# add -rpath to avoid conflicts between our OpenSSL's "libssl.so" and the libssl package by making sure /usr/local/lib is searched first (but only for Erlang/OpenSSL to avoid issues with other tools using libssl; https://github.com/docker-library/rabbitmq/issues/364)
-Wl,-rpath=/usr/local/lib \
+ ${opensslExtraConfig:-} \
; \
# Compile, install OpenSSL, verify that the command-line works & development headers are present
make -j "$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/rabbitmq_3.10/Dockerfile b/rabbitmq_3.10/Dockerfile
index 0ec947d..d51e149 100644
--- a/rabbitmq_3.10/Dockerfile
+++ b/rabbitmq_3.10/Dockerfile
@@ -30,10 +30,10 @@ ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-ENV OTP_VERSION 25.3.2.4
+ENV OTP_VERSION 25.3.2.5
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="9d224c098abbb48fbe42abb81bd04765efa2190d9eae4898f78183d9725a676b"
+ENV OTP_SOURCE_SHA256="1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db"
# Install dependencies required to build Erlang/OTP from source
# https://erlang.org/doc/installation_guide/INSTALL.html
@@ -64,16 +64,33 @@ RUN set -eux; \
# without specifying "--libdir", Erlang will fail during "crypto:supports()" looking for a "pthread_atfork" function that doesn't exist (but only on arm32v7/armhf??)
debMultiarch="$(dpkg-architecture --query DEB_HOST_MULTIARCH)"; \
# OpenSSL's "config" script uses a lot of "uname"-based target detection...
- MACHINE="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" \
+ dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+# https://deb.debian.org/debian/dists/unstable/main/
+ case "$dpkgArch" in \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+ amd64) opensslMachine='linux-x86_64' ;; \
+ arm64) opensslMachine='linux-aarch64' ;; \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L736-L766
+ armhf) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv7-a' ;; \
+ i386) opensslMachine='linux-x86' ;; \
+ ppc64el) opensslMachine='linux-ppc64le' ;; \
+ riscv64) opensslMachine='linux64-riscv64' ;; \
+ s390x) opensslMachine='linux64-s390x' ;; \
+ *) echo >&2 "error: unsupported arch: '$apkArch'"; exit 1 ;; \
+ esac; \
+ MACHINE="$opensslMachine" \
RELEASE="4.x.y-z" \
SYSTEM='Linux' \
BUILD='???' \
- ./config \
+ ./Configure \
+ "$opensslMachine" \
enable-fips \
--openssldir="$OPENSSL_CONFIG_DIR" \
--libdir="/usr/local/lib/$debMultiarch" \
# add -rpath to avoid conflicts between our OpenSSL's "libssl.so" and the libssl package by making sure /usr/local/lib/$debMultiarch is searched first (but only for Erlang/OpenSSL to avoid issues with other tools using libssl; https://github.com/docker-library/rabbitmq/issues/364)
-Wl,-rpath="/usr/local/lib/$debMultiarch" \
+ ${opensslExtraConfig:-} \
; \
# Compile, install OpenSSL, verify that the command-line works & development headers are present
make -j "$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/rabbitmq_3.11-alpine/Dockerfile b/rabbitmq_3.11-alpine/Dockerfile
index e62f276..d7401f8 100644
--- a/rabbitmq_3.11-alpine/Dockerfile
+++ b/rabbitmq_3.11-alpine/Dockerfile
@@ -29,10 +29,10 @@ ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-ENV OTP_VERSION 25.3.2.4
+ENV OTP_VERSION 25.3.2.5
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="9d224c098abbb48fbe42abb81bd04765efa2190d9eae4898f78183d9725a676b"
+ENV OTP_SOURCE_SHA256="1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db"
# Install dependencies required to build Erlang/OTP from source
# https://erlang.org/doc/installation_guide/INSTALL.html
@@ -64,16 +64,33 @@ RUN set -eux; \
# Configure OpenSSL for compilation
cd "$OPENSSL_PATH"; \
# OpenSSL's "config" script uses a lot of "uname"-based target detection...
- MACHINE="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" \
+ apkArch="$(apk --print-arch)"; \
+# https://dl-cdn.alpinelinux.org/alpine/edge/main/
+ case "$apkArch" in \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+ aarch64) opensslMachine='linux-aarch64' ;; \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L736-L766
+ armhf) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv6' ;; \
+ armv7) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv7-a' ;; \
+ ppc64le) opensslMachine='linux-ppc64le' ;; \
+ riscv64) opensslMachine='linux64-riscv64' ;; \
+ s390x) opensslMachine='linux64-s390x' ;; \
+ x86) opensslMachine='linux-x86' ;; \
+ x86_64) opensslMachine='linux-x86_64' ;; \
+ *) echo >&2 "error: unsupported arch: '$apkArch'"; exit 1 ;; \
+ esac; \
+ MACHINE="$opensslMachine" \
RELEASE="4.x.y-z" \
SYSTEM='Linux' \
BUILD='???' \
- ./config \
+ ./Configure \
+ "$opensslMachine" \
enable-fips \
--openssldir="$OPENSSL_CONFIG_DIR" \
--libdir=/usr/local/lib \
# add -rpath to avoid conflicts between our OpenSSL's "libssl.so" and the libssl package by making sure /usr/local/lib is searched first (but only for Erlang/OpenSSL to avoid issues with other tools using libssl; https://github.com/docker-library/rabbitmq/issues/364)
-Wl,-rpath=/usr/local/lib \
+ ${opensslExtraConfig:-} \
; \
# Compile, install OpenSSL, verify that the command-line works & development headers are present
make -j "$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/rabbitmq_3.11/Dockerfile b/rabbitmq_3.11/Dockerfile
index 2904bbd..ee94358 100644
--- a/rabbitmq_3.11/Dockerfile
+++ b/rabbitmq_3.11/Dockerfile
@@ -30,10 +30,10 @@ ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-ENV OTP_VERSION 25.3.2.4
+ENV OTP_VERSION 25.3.2.5
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="9d224c098abbb48fbe42abb81bd04765efa2190d9eae4898f78183d9725a676b"
+ENV OTP_SOURCE_SHA256="1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db"
# Install dependencies required to build Erlang/OTP from source
# https://erlang.org/doc/installation_guide/INSTALL.html
@@ -64,16 +64,33 @@ RUN set -eux; \
# without specifying "--libdir", Erlang will fail during "crypto:supports()" looking for a "pthread_atfork" function that doesn't exist (but only on arm32v7/armhf??)
debMultiarch="$(dpkg-architecture --query DEB_HOST_MULTIARCH)"; \
# OpenSSL's "config" script uses a lot of "uname"-based target detection...
- MACHINE="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" \
+ dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+# https://deb.debian.org/debian/dists/unstable/main/
+ case "$dpkgArch" in \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+ amd64) opensslMachine='linux-x86_64' ;; \
+ arm64) opensslMachine='linux-aarch64' ;; \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L736-L766
+ armhf) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv7-a' ;; \
+ i386) opensslMachine='linux-x86' ;; \
+ ppc64el) opensslMachine='linux-ppc64le' ;; \
+ riscv64) opensslMachine='linux64-riscv64' ;; \
+ s390x) opensslMachine='linux64-s390x' ;; \
+ *) echo >&2 "error: unsupported arch: '$apkArch'"; exit 1 ;; \
+ esac; \
+ MACHINE="$opensslMachine" \
RELEASE="4.x.y-z" \
SYSTEM='Linux' \
BUILD='???' \
- ./config \
+ ./Configure \
+ "$opensslMachine" \
enable-fips \
--openssldir="$OPENSSL_CONFIG_DIR" \
--libdir="/usr/local/lib/$debMultiarch" \
# add -rpath to avoid conflicts between our OpenSSL's "libssl.so" and the libssl package by making sure /usr/local/lib/$debMultiarch is searched first (but only for Erlang/OpenSSL to avoid issues with other tools using libssl; https://github.com/docker-library/rabbitmq/issues/364)
-Wl,-rpath="/usr/local/lib/$debMultiarch" \
+ ${opensslExtraConfig:-} \
; \
# Compile, install OpenSSL, verify that the command-line works & development headers are present
make -j "$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/rabbitmq_3.13-rc-alpine/Dockerfile b/rabbitmq_3.13-rc-alpine/Dockerfile
index f5d31b1..cd24ef8 100644
--- a/rabbitmq_3.13-rc-alpine/Dockerfile
+++ b/rabbitmq_3.13-rc-alpine/Dockerfile
@@ -64,16 +64,33 @@ RUN set -eux; \
# Configure OpenSSL for compilation
cd "$OPENSSL_PATH"; \
# OpenSSL's "config" script uses a lot of "uname"-based target detection...
- MACHINE="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" \
+ apkArch="$(apk --print-arch)"; \
+# https://dl-cdn.alpinelinux.org/alpine/edge/main/
+ case "$apkArch" in \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+ aarch64) opensslMachine='linux-aarch64' ;; \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L736-L766
+ armhf) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv6' ;; \
+ armv7) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv7-a' ;; \
+ ppc64le) opensslMachine='linux-ppc64le' ;; \
+ riscv64) opensslMachine='linux64-riscv64' ;; \
+ s390x) opensslMachine='linux64-s390x' ;; \
+ x86) opensslMachine='linux-x86' ;; \
+ x86_64) opensslMachine='linux-x86_64' ;; \
+ *) echo >&2 "error: unsupported arch: '$apkArch'"; exit 1 ;; \
+ esac; \
+ MACHINE="$opensslMachine" \
RELEASE="4.x.y-z" \
SYSTEM='Linux' \
BUILD='???' \
- ./config \
+ ./Configure \
+ "$opensslMachine" \
enable-fips \
--openssldir="$OPENSSL_CONFIG_DIR" \
--libdir=/usr/local/lib \
# add -rpath to avoid conflicts between our OpenSSL's "libssl.so" and the libssl package by making sure /usr/local/lib is searched first (but only for Erlang/OpenSSL to avoid issues with other tools using libssl; https://github.com/docker-library/rabbitmq/issues/364)
-Wl,-rpath=/usr/local/lib \
+ ${opensslExtraConfig:-} \
; \
# Compile, install OpenSSL, verify that the command-line works & development headers are present
make -j "$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/rabbitmq_3.13-rc/Dockerfile b/rabbitmq_3.13-rc/Dockerfile
index c0623c1..3a95e8f 100644
--- a/rabbitmq_3.13-rc/Dockerfile
+++ b/rabbitmq_3.13-rc/Dockerfile
@@ -64,16 +64,33 @@ RUN set -eux; \
# without specifying "--libdir", Erlang will fail during "crypto:supports()" looking for a "pthread_atfork" function that doesn't exist (but only on arm32v7/armhf??)
debMultiarch="$(dpkg-architecture --query DEB_HOST_MULTIARCH)"; \
# OpenSSL's "config" script uses a lot of "uname"-based target detection...
- MACHINE="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" \
+ dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+# https://deb.debian.org/debian/dists/unstable/main/
+ case "$dpkgArch" in \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+ amd64) opensslMachine='linux-x86_64' ;; \
+ arm64) opensslMachine='linux-aarch64' ;; \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L736-L766
+ armhf) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv7-a' ;; \
+ i386) opensslMachine='linux-x86' ;; \
+ ppc64el) opensslMachine='linux-ppc64le' ;; \
+ riscv64) opensslMachine='linux64-riscv64' ;; \
+ s390x) opensslMachine='linux64-s390x' ;; \
+ *) echo >&2 "error: unsupported arch: '$apkArch'"; exit 1 ;; \
+ esac; \
+ MACHINE="$opensslMachine" \
RELEASE="4.x.y-z" \
SYSTEM='Linux' \
BUILD='???' \
- ./config \
+ ./Configure \
+ "$opensslMachine" \
enable-fips \
--openssldir="$OPENSSL_CONFIG_DIR" \
--libdir="/usr/local/lib/$debMultiarch" \
# add -rpath to avoid conflicts between our OpenSSL's "libssl.so" and the libssl package by making sure /usr/local/lib/$debMultiarch is searched first (but only for Erlang/OpenSSL to avoid issues with other tools using libssl; https://github.com/docker-library/rabbitmq/issues/364)
-Wl,-rpath="/usr/local/lib/$debMultiarch" \
+ ${opensslExtraConfig:-} \
; \
# Compile, install OpenSSL, verify that the command-line works & development headers are present
make -j "$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/rabbitmq_3.9-alpine/Dockerfile b/rabbitmq_3.9-alpine/Dockerfile
index 69c225c..aaeab96 100644
--- a/rabbitmq_3.9-alpine/Dockerfile
+++ b/rabbitmq_3.9-alpine/Dockerfile
@@ -29,10 +29,10 @@ ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-ENV OTP_VERSION 25.3.2.4
+ENV OTP_VERSION 25.3.2.5
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="9d224c098abbb48fbe42abb81bd04765efa2190d9eae4898f78183d9725a676b"
+ENV OTP_SOURCE_SHA256="1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db"
# Install dependencies required to build Erlang/OTP from source
# https://erlang.org/doc/installation_guide/INSTALL.html
@@ -64,16 +64,33 @@ RUN set -eux; \
# Configure OpenSSL for compilation
cd "$OPENSSL_PATH"; \
# OpenSSL's "config" script uses a lot of "uname"-based target detection...
- MACHINE="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" \
+ apkArch="$(apk --print-arch)"; \
+# https://dl-cdn.alpinelinux.org/alpine/edge/main/
+ case "$apkArch" in \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+ aarch64) opensslMachine='linux-aarch64' ;; \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L736-L766
+ armhf) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv6' ;; \
+ armv7) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv7-a' ;; \
+ ppc64le) opensslMachine='linux-ppc64le' ;; \
+ riscv64) opensslMachine='linux64-riscv64' ;; \
+ s390x) opensslMachine='linux64-s390x' ;; \
+ x86) opensslMachine='linux-x86' ;; \
+ x86_64) opensslMachine='linux-x86_64' ;; \
+ *) echo >&2 "error: unsupported arch: '$apkArch'"; exit 1 ;; \
+ esac; \
+ MACHINE="$opensslMachine" \
RELEASE="4.x.y-z" \
SYSTEM='Linux' \
BUILD='???' \
- ./config \
+ ./Configure \
+ "$opensslMachine" \
enable-fips \
--openssldir="$OPENSSL_CONFIG_DIR" \
--libdir=/usr/local/lib \
# add -rpath to avoid conflicts between our OpenSSL's "libssl.so" and the libssl package by making sure /usr/local/lib is searched first (but only for Erlang/OpenSSL to avoid issues with other tools using libssl; https://github.com/docker-library/rabbitmq/issues/364)
-Wl,-rpath=/usr/local/lib \
+ ${opensslExtraConfig:-} \
; \
# Compile, install OpenSSL, verify that the command-line works & development headers are present
make -j "$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/rabbitmq_3.9/Dockerfile b/rabbitmq_3.9/Dockerfile
index 3a77fe7..1a617b5 100644
--- a/rabbitmq_3.9/Dockerfile
+++ b/rabbitmq_3.9/Dockerfile
@@ -30,10 +30,10 @@ ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-ENV OTP_VERSION 25.3.2.4
+ENV OTP_VERSION 25.3.2.5
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="9d224c098abbb48fbe42abb81bd04765efa2190d9eae4898f78183d9725a676b"
+ENV OTP_SOURCE_SHA256="1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db"
# Install dependencies required to build Erlang/OTP from source
# https://erlang.org/doc/installation_guide/INSTALL.html
@@ -64,16 +64,33 @@ RUN set -eux; \
# without specifying "--libdir", Erlang will fail during "crypto:supports()" looking for a "pthread_atfork" function that doesn't exist (but only on arm32v7/armhf??)
debMultiarch="$(dpkg-architecture --query DEB_HOST_MULTIARCH)"; \
# OpenSSL's "config" script uses a lot of "uname"-based target detection...
- MACHINE="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" \
+ dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+# https://deb.debian.org/debian/dists/unstable/main/
+ case "$dpkgArch" in \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+ amd64) opensslMachine='linux-x86_64' ;; \
+ arm64) opensslMachine='linux-aarch64' ;; \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L736-L766
+ armhf) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv7-a' ;; \
+ i386) opensslMachine='linux-x86' ;; \
+ ppc64el) opensslMachine='linux-ppc64le' ;; \
+ riscv64) opensslMachine='linux64-riscv64' ;; \
+ s390x) opensslMachine='linux64-s390x' ;; \
+ *) echo >&2 "error: unsupported arch: '$apkArch'"; exit 1 ;; \
+ esac; \
+ MACHINE="$opensslMachine" \
RELEASE="4.x.y-z" \
SYSTEM='Linux' \
BUILD='???' \
- ./config \
+ ./Configure \
+ "$opensslMachine" \
enable-fips \
--openssldir="$OPENSSL_CONFIG_DIR" \
--libdir="/usr/local/lib/$debMultiarch" \
# add -rpath to avoid conflicts between our OpenSSL's "libssl.so" and the libssl package by making sure /usr/local/lib/$debMultiarch is searched first (but only for Erlang/OpenSSL to avoid issues with other tools using libssl; https://github.com/docker-library/rabbitmq/issues/364)
-Wl,-rpath="/usr/local/lib/$debMultiarch" \
+ ${opensslExtraConfig:-} \
; \
# Compile, install OpenSSL, verify that the command-line works & development headers are present
make -j "$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/rabbitmq_alpine/Dockerfile b/rabbitmq_alpine/Dockerfile
index 536894e..1bb1e33 100644
--- a/rabbitmq_alpine/Dockerfile
+++ b/rabbitmq_alpine/Dockerfile
@@ -29,10 +29,10 @@ ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-ENV OTP_VERSION 25.3.2.4
+ENV OTP_VERSION 25.3.2.5
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="9d224c098abbb48fbe42abb81bd04765efa2190d9eae4898f78183d9725a676b"
+ENV OTP_SOURCE_SHA256="1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db"
# Install dependencies required to build Erlang/OTP from source
# https://erlang.org/doc/installation_guide/INSTALL.html
@@ -64,16 +64,33 @@ RUN set -eux; \
# Configure OpenSSL for compilation
cd "$OPENSSL_PATH"; \
# OpenSSL's "config" script uses a lot of "uname"-based target detection...
- MACHINE="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" \
+ apkArch="$(apk --print-arch)"; \
+# https://dl-cdn.alpinelinux.org/alpine/edge/main/
+ case "$apkArch" in \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+ aarch64) opensslMachine='linux-aarch64' ;; \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L736-L766
+ armhf) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv6' ;; \
+ armv7) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv7-a' ;; \
+ ppc64le) opensslMachine='linux-ppc64le' ;; \
+ riscv64) opensslMachine='linux64-riscv64' ;; \
+ s390x) opensslMachine='linux64-s390x' ;; \
+ x86) opensslMachine='linux-x86' ;; \
+ x86_64) opensslMachine='linux-x86_64' ;; \
+ *) echo >&2 "error: unsupported arch: '$apkArch'"; exit 1 ;; \
+ esac; \
+ MACHINE="$opensslMachine" \
RELEASE="4.x.y-z" \
SYSTEM='Linux' \
BUILD='???' \
- ./config \
+ ./Configure \
+ "$opensslMachine" \
enable-fips \
--openssldir="$OPENSSL_CONFIG_DIR" \
--libdir=/usr/local/lib \
# add -rpath to avoid conflicts between our OpenSSL's "libssl.so" and the libssl package by making sure /usr/local/lib is searched first (but only for Erlang/OpenSSL to avoid issues with other tools using libssl; https://github.com/docker-library/rabbitmq/issues/364)
-Wl,-rpath=/usr/local/lib \
+ ${opensslExtraConfig:-} \
; \
# Compile, install OpenSSL, verify that the command-line works & development headers are present
make -j "$(getconf _NPROCESSORS_ONLN)"; \
diff --git a/rabbitmq_latest/Dockerfile b/rabbitmq_latest/Dockerfile
index 6e12f93..549cc7b 100644
--- a/rabbitmq_latest/Dockerfile
+++ b/rabbitmq_latest/Dockerfile
@@ -30,10 +30,10 @@ ENV OPENSSL_SOURCE_SHA256="b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118
# https://www.openssl.org/community/otc.html
ENV OPENSSL_PGP_KEY_IDS="0x8657ABB260F056B1E5190839D9C4D26D0E604491 0xB7C1C14360F353A36862E4D5231C84CDDCC69C45 0xC1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD 0x95A9908DDFA16830BE9FB9003D30A3A9FF1360DC 0x7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C 0xA21FAB74B0088AA361152586B8EF1A6BA9DA2D5C 0xE5E52560DD91C556DDBDA5D02064C53641C25E5D"
-ENV OTP_VERSION 25.3.2.4
+ENV OTP_VERSION 25.3.2.5
# TODO add PGP checking when the feature will be added to Erlang/OTP's build system
# https://erlang.org/pipermail/erlang-questions/2019-January/097067.html
-ENV OTP_SOURCE_SHA256="9d224c098abbb48fbe42abb81bd04765efa2190d9eae4898f78183d9725a676b"
+ENV OTP_SOURCE_SHA256="1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db"
# Install dependencies required to build Erlang/OTP from source
# https://erlang.org/doc/installation_guide/INSTALL.html
@@ -64,16 +64,33 @@ RUN set -eux; \
# without specifying "--libdir", Erlang will fail during "crypto:supports()" looking for a "pthread_atfork" function that doesn't exist (but only on arm32v7/armhf??)
debMultiarch="$(dpkg-architecture --query DEB_HOST_MULTIARCH)"; \
# OpenSSL's "config" script uses a lot of "uname"-based target detection...
- MACHINE="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" \
+ dpkgArch="$(dpkg --print-architecture)"; dpkgArch="${dpkgArch##*-}"; \
+# https://deb.debian.org/debian/dists/unstable/main/
+ case "$dpkgArch" in \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L860 (look for "linux-" and "linux64-" keys)
+ amd64) opensslMachine='linux-x86_64' ;; \
+ arm64) opensslMachine='linux-aarch64' ;; \
+# https://github.com/openssl/openssl/blob/openssl-3.1.1/Configurations/10-main.conf#L736-L766
+ armhf) opensslMachine='linux-armv4'; opensslExtraConfig='-march=armv7-a' ;; \
+ i386) opensslMachine='linux-x86' ;; \
+ ppc64el) opensslMachine='linux-ppc64le' ;; \
+ riscv64) opensslMachine='linux64-riscv64' ;; \
+ s390x) opensslMachine='linux64-s390x' ;; \
+ *) echo >&2 "error: unsupported arch: '$apkArch'"; exit 1 ;; \
+ esac; \
+ MACHINE="$opensslMachine" \
RELEASE="4.x.y-z" \
SYSTEM='Linux' \
BUILD='???' \
- ./config \
+ ./Configure \
+ "$opensslMachine" \
enable-fips \
--openssldir="$OPENSSL_CONFIG_DIR" \
--libdir="/usr/local/lib/$debMultiarch" \
# add -rpath to avoid conflicts between our OpenSSL's "libssl.so" and the libssl package by making sure /usr/local/lib/$debMultiarch is searched first (but only for Erlang/OpenSSL to avoid issues with other tools using libssl; https://github.com/docker-library/rabbitmq/issues/364)
-Wl,-rpath="/usr/local/lib/$debMultiarch" \
+ ${opensslExtraConfig:-} \
; \
# Compile, install OpenSSL, verify that the command-line works & development headers are present
make -j "$(getconf _NPROCESSORS_ONLN)"; \Relevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: