From 950d111b49090ca7149fe8474ff0f47e45694e7a Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Wed, 8 Jan 2025 15:06:28 -0800 Subject: [PATCH] force openssl to use lib dir to simplify pyenv build --- rocky8/Dockerfile | 5 ++--- ubuntu-20.04/Dockerfile | 10 ++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/rocky8/Dockerfile b/rocky8/Dockerfile index a8e1700..c2bf295 100644 --- a/rocky8/Dockerfile +++ b/rocky8/Dockerfile @@ -32,7 +32,7 @@ yum -y install perl-IPC-Cmd perl-Pod-Html && \ wget -q https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz && \ tar -xzf openssl-3.0.15.tar.gz && \ cd openssl-3.0.15 && \ -./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib && \ +./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl --libdir=lib shared zlib && \ make && \ make install && \ cd ~ && \ @@ -42,8 +42,7 @@ rm -rf ~/openssl-3.0.15* RUN yum -y install zlib-devel bzip2 bzip2-devel readline-devel tk-devel libffi-devel xz-devel && \ cd ~ && \ # Set up pyenv \ - export LDFLAGS="-L/usr/local/ssl/lib64" && \ - export PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=/usr/local/ssl/lib64 --enable-shared --enable-optimizations" && \ + export PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=auto --enable-shared --enable-optimizations" && \ git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \ pyenv install 3.11 --verbose && \ pyenv global 3.11 && \ diff --git a/ubuntu-20.04/Dockerfile b/ubuntu-20.04/Dockerfile index d6caec2..4f63d24 100644 --- a/ubuntu-20.04/Dockerfile +++ b/ubuntu-20.04/Dockerfile @@ -62,7 +62,7 @@ RUN cd ~ && \ wget -q https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz && \ tar -xzf openssl-3.0.15.tar.gz && \ cd openssl-3.0.15 && \ -./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib && \ +./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl --libdir=lib shared zlib && \ make && \ make install && \ cd ~ && \ @@ -70,13 +70,7 @@ rm -rf ~/openssl-3.0.15* # Set up pyenv \ RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \ - if [ -d '/usr/local/ssl/lib64' ]; then \ - export LDFLAGS="-L/usr/local/ssl/lib64" && \ - export PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=/usr/local/ssl/lib64 --enable-shared --enable-optimizations"; \ - else \ - export LDFLAGS="-L/usr/local/ssl/lib" && \ - export PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=auto --enable-shared --enable-optimizations"; \ - fi && \ + export PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=auto --enable-shared --enable-optimizations" && \ pyenv install 3.11 --verbose && \ pyenv global 3.11 && \ pip install --upgrade pip && \