docker-library
/
rabbitmq
mirror of https://github.com/docker-library/rabbitmq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix shared library loading preference on non-x86 architectures (especially those like aarch64 which sort lexicographically ahead of "libc.conf") 

See https://bugs.debian.org/685706 for the upstream bug report
This commit is contained in:
Tianon Gravi 2019-02-04 14:16:30 -08:00
parent 0576eabd93
commit 54b5bd526b
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3.7-rc/ubuntu/Dockerfile
View File

@ -80,6 +80,9 @@ RUN set -eux; \
make install_sw install_ssldirs; \ make install_sw install_ssldirs; \
cd ..; \ cd ..; \
rm -rf "$OPENSSL_PATH"*; \ rm -rf "$OPENSSL_PATH"*; \
# this is included in "/etc/ld.so.conf.d/libc.conf", but on arm64, it gets overshadowed by "/etc/ld.so.conf.d/aarch64-linux-gnu.conf" (vs "/etc/ld.so.conf.d/x86_64-linux-gnu.conf") so the precedence isn't correct -- we install our own file to overcome that and ensure any .so files in /usr/local/lib (especially OpenSSL's libssl.so) are preferred appropriately regardless of the target architecture
# see https://bugs.debian.org/685706
echo '/usr/local/lib' > /etc/ld.so.conf.d/000-openssl-libc.conf; \
ldconfig; \ ldconfig; \
# use Debian's CA certificates # use Debian's CA certificates
rmdir "$OPENSSL_CONFIG_DIR/certs" "$OPENSSL_CONFIG_DIR/private"; \ rmdir "$OPENSSL_CONFIG_DIR/certs" "$OPENSSL_CONFIG_DIR/private"; \

3
3.7/ubuntu/Dockerfile
View File

@ -80,6 +80,9 @@ RUN set -eux; \
make install_sw install_ssldirs; \ make install_sw install_ssldirs; \
cd ..; \ cd ..; \
rm -rf "$OPENSSL_PATH"*; \ rm -rf "$OPENSSL_PATH"*; \
# this is included in "/etc/ld.so.conf.d/libc.conf", but on arm64, it gets overshadowed by "/etc/ld.so.conf.d/aarch64-linux-gnu.conf" (vs "/etc/ld.so.conf.d/x86_64-linux-gnu.conf") so the precedence isn't correct -- we install our own file to overcome that and ensure any .so files in /usr/local/lib (especially OpenSSL's libssl.so) are preferred appropriately regardless of the target architecture
# see https://bugs.debian.org/685706
echo '/usr/local/lib' > /etc/ld.so.conf.d/000-openssl-libc.conf; \
ldconfig; \ ldconfig; \
# use Debian's CA certificates # use Debian's CA certificates
rmdir "$OPENSSL_CONFIG_DIR/certs" "$OPENSSL_CONFIG_DIR/private"; \ rmdir "$OPENSSL_CONFIG_DIR/certs" "$OPENSSL_CONFIG_DIR/private"; \

3
3.8-rc/ubuntu/Dockerfile
View File

@ -80,6 +80,9 @@ RUN set -eux; \
make install_sw install_ssldirs; \ make install_sw install_ssldirs; \
cd ..; \ cd ..; \
rm -rf "$OPENSSL_PATH"*; \ rm -rf "$OPENSSL_PATH"*; \
# this is included in "/etc/ld.so.conf.d/libc.conf", but on arm64, it gets overshadowed by "/etc/ld.so.conf.d/aarch64-linux-gnu.conf" (vs "/etc/ld.so.conf.d/x86_64-linux-gnu.conf") so the precedence isn't correct -- we install our own file to overcome that and ensure any .so files in /usr/local/lib (especially OpenSSL's libssl.so) are preferred appropriately regardless of the target architecture
# see https://bugs.debian.org/685706
echo '/usr/local/lib' > /etc/ld.so.conf.d/000-openssl-libc.conf; \
ldconfig; \ ldconfig; \
# use Debian's CA certificates # use Debian's CA certificates
rmdir "$OPENSSL_CONFIG_DIR/certs" "$OPENSSL_CONFIG_DIR/private"; \ rmdir "$OPENSSL_CONFIG_DIR/certs" "$OPENSSL_CONFIG_DIR/private"; \

3
Dockerfile-ubuntu.template
View File

@ -80,6 +80,9 @@ RUN set -eux; \
make install_sw install_ssldirs; \ make install_sw install_ssldirs; \
cd ..; \ cd ..; \
rm -rf "$OPENSSL_PATH"*; \ rm -rf "$OPENSSL_PATH"*; \
# this is included in "/etc/ld.so.conf.d/libc.conf", but on arm64, it gets overshadowed by "/etc/ld.so.conf.d/aarch64-linux-gnu.conf" (vs "/etc/ld.so.conf.d/x86_64-linux-gnu.conf") so the precedence isn't correct -- we install our own file to overcome that and ensure any .so files in /usr/local/lib (especially OpenSSL's libssl.so) are preferred appropriately regardless of the target architecture
# see https://bugs.debian.org/685706
echo '/usr/local/lib' > /etc/ld.so.conf.d/000-openssl-libc.conf; \
ldconfig; \ ldconfig; \
# use Debian's CA certificates # use Debian's CA certificates
rmdir "$OPENSSL_CONFIG_DIR/certs" "$OPENSSL_CONFIG_DIR/private"; \ rmdir "$OPENSSL_CONFIG_DIR/certs" "$OPENSSL_CONFIG_DIR/private"; \