From 97a57bdbddbf4880e074a64de19ea534aa3abfb4 Mon Sep 17 00:00:00 2001
From: Earle Lowe <e.lowe@chia.net>
Date: Wed, 8 Jan 2025 13:46:43 -0800
Subject: [PATCH] Some more updates

---
 rocky8/Dockerfile       | 19 +++++++++++++++++--
 ubuntu-20.04/Dockerfile |  4 ++--
 ubuntu-22.04/Dockerfile |  3 ++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/rocky8/Dockerfile b/rocky8/Dockerfile
index fd62670..a8e1700 100644
--- a/rocky8/Dockerfile
+++ b/rocky8/Dockerfile
@@ -26,16 +26,31 @@ RUN cd ~ && \
     cd ~ && \
     rm -rf ~/sqlite-autoconf*
 
+# Compile newer version of openssl \
+RUN cd ~ && \
+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 && \
+make && \
+make install && \
+cd ~ && \
+rm -rf ~/openssl-3.0.15*
+
 # Compile newer version of python3
-RUN yum -y install openssl openssl-devel zlib-devel bzip2 bzip2-devel readline-devel tk-devel libffi-devel xz-devel && \
+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" && \
     git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \
-    pyenv install 3.11 && \
+    pyenv install 3.11 --verbose && \
     pyenv global 3.11 && \
     pip install --upgrade pip && \
     pip install --no-cache-dir py3createtorrent awscli && \
     python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.45.1")' && \
+    python3 -c 'import sys; import ssl; sys.exit(ssl.OPENSSL_VERSION_INFO != (3,0,0,15,0))' && \
     yum clean all
 
 # Add nodejs
diff --git a/ubuntu-20.04/Dockerfile b/ubuntu-20.04/Dockerfile
index d0b6820..418dc9d 100644
--- a/ubuntu-20.04/Dockerfile
+++ b/ubuntu-20.04/Dockerfile
@@ -70,8 +70,8 @@ rm -rf ~/openssl-3.0.15*
 
 # Set up pyenv \
 RUN git clone https://github.com/pyenv/pyenv.git ~/.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 LDFLAGS="-L/usr/local/ssl/lib" && \
+    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 && \
diff --git a/ubuntu-22.04/Dockerfile b/ubuntu-22.04/Dockerfile
index 7c32523..92ab1c2 100644
--- a/ubuntu-22.04/Dockerfile
+++ b/ubuntu-22.04/Dockerfile
@@ -58,7 +58,8 @@ RUN cd ~ && \
 
 # Set up pyenv
 RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \
-    pyenv install 3.11 && \
+    export PYTHON_CONFIGURE_OPTS="--enable-shared --enable-optimizations" && \
+    pyenv install 3.11 --verbose && \
     pyenv global 3.11 && \
     pip install --upgrade pip && \
     pip install --no-cache-dir py3createtorrent && \