diff --git a/rocky8/Dockerfile b/rocky8/Dockerfile index c398f27..1a30c28 100644 --- a/rocky8/Dockerfile +++ b/rocky8/Dockerfile @@ -26,16 +26,33 @@ RUN cd ~ && \ cd ~ && \ rm -rf ~/sqlite-autoconf* +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 --libdir=lib no-ssl3 no-idea no-dtls no-srp no-comp shared && \ + 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 && \ cd ~ && \ # Set up pyenv \ git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \ + # setup python 3.10 \ pyenv install 3.10 && \ + # setup python 3.11 w/ openssl 3 \ + PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=auto --enable-shared --enable-optimizations" pyenv install 3.11 && \ pyenv global 3.10 && \ pip install --upgrade pip && \ pip install --no-cache-dir py3createtorrent awscli && \ python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.40.1")' && \ + pyenv global 3.11 && \ + python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.40.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 3c809ec..d10aaf0 100644 --- a/ubuntu-20.04/Dockerfile +++ b/ubuntu-20.04/Dockerfile @@ -56,13 +56,29 @@ RUN cd ~ && \ cd ~ && \ rm -rf ~/sqlite-autoconf* -# Set up pyenv \ +# Compile newer version of openssl \ +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 --libdir=lib no-ssl3 no-idea no-dtls no-srp no-comp shared && \ + make && \ + make install && \ + cd ~ && \ + rm -rf ~/openssl-3.0.15* + +# Set up pyenv RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \ pyenv install 3.10 && \ + PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=auto --enable-shared --enable-optimizations" pyenv install 3.11 && \ pyenv global 3.10 && \ pip install --upgrade pip && \ pip install --no-cache-dir py3createtorrent && \ - python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.40.1")' + python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.40.1")' && \ + pyenv global 3.11 && \ + python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.40.1")' && \ + python3 -c 'import sys; import ssl; sys.exit(ssl.OPENSSL_VERSION_INFO != (3,0,0,15,0))' + # Add nodejs ENV NODE_MAJOR=18 diff --git a/ubuntu-22.04/Dockerfile b/ubuntu-22.04/Dockerfile index 5a042a1..c067c69 100644 --- a/ubuntu-22.04/Dockerfile +++ b/ubuntu-22.04/Dockerfile @@ -59,11 +59,15 @@ RUN cd ~ && \ # Set up pyenv RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \ pyenv install 3.10 && \ + PYTHON_CONFIGURE_OPTS="--enable-shared --enable-optimizations" pyenv install 3.11 && \ pyenv global 3.10 && \ pip install --upgrade pip && \ pip install --no-cache-dir py3createtorrent && \ + python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.40.1")' && \ + pyenv global 3.11 && \ python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.40.1")' + # Add nodejs ENV NODE_MAJOR=18 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \