Skip to content

Commit eb3bc70

Browse files
committed
Use libssl-dev package on Ubuntu >= 16.04
1 parent 79bfca0 commit eb3bc70

2 files changed

Lines changed: 4 additions & 22 deletions

File tree

Dockerfile-py3-focal-amd64

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,7 @@ RUN \
3333
uuid-dev \
3434
#upx
3535
upx \
36-
# required because openSSL on Ubuntu 12.04 and 14.04 run out of support versions of OpenSSL
37-
&& mkdir openssl \
38-
&& cd openssl \
39-
# latest version, there won't be anything newer for this
40-
&& wget https://www.openssl.org/source/openssl-1.0.2u.tar.gz \
41-
&& tar -xzvf openssl-1.0.2u.tar.gz \
42-
&& cd openssl-1.0.2u \
43-
&& ./config --prefix=$HOME/openssl --openssldir=$HOME/openssl shared zlib \
44-
&& make \
45-
&& make install \
36+
libssl-dev \
4637
# install pyenv
4738
&& echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \
4839
&& echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \
@@ -51,7 +42,7 @@ RUN \
5142
&& echo 'eval "$(pyenv init -)"' >> ~/.bashrc \
5243
&& source ~/.bashrc \
5344
# install python
54-
&& PATH="$HOME/openssl:$PATH" CPPFLAGS="-O2 -I$HOME/openssl/include" CFLAGS="-I$HOME/openssl/include/" LDFLAGS="-L$HOME/openssl/lib -Wl,-rpath,$HOME/openssl/lib" LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH LD_RUN_PATH="$HOME/openssl/lib" CONFIGURE_OPTS="--with-openssl=$HOME/openssl" PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_VERSION \
45+
&& CONFIGURE_OPTS=--enable-shared pyenv install $PYTHON_VERSION \
5546
&& pyenv global $PYTHON_VERSION \
5647
&& pip install --upgrade pip \
5748
# install pyinstaller

Dockerfile-py3-xenial-amd64

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,7 @@ RUN \
3333
uuid-dev \
3434
#upx
3535
upx \
36-
# required because openSSL on Ubuntu 12.04 and 14.04 run out of support versions of OpenSSL
37-
&& mkdir openssl \
38-
&& cd openssl \
39-
# latest version, there won't be anything newer for this
40-
&& wget https://www.openssl.org/source/openssl-1.0.2u.tar.gz \
41-
&& tar -xzvf openssl-1.0.2u.tar.gz \
42-
&& cd openssl-1.0.2u \
43-
&& ./config --prefix=$HOME/openssl --openssldir=$HOME/openssl shared zlib \
44-
&& make \
45-
&& make install \
36+
libssl-dev \
4637
# install pyenv
4738
&& echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \
4839
&& echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \
@@ -51,7 +42,7 @@ RUN \
5142
&& echo 'eval "$(pyenv init -)"' >> ~/.bashrc \
5243
&& source ~/.bashrc \
5344
# install python
54-
&& PATH="$HOME/openssl:$PATH" CPPFLAGS="-O2 -I$HOME/openssl/include" CFLAGS="-I$HOME/openssl/include/" LDFLAGS="-L$HOME/openssl/lib -Wl,-rpath,$HOME/openssl/lib" LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH LD_RUN_PATH="$HOME/openssl/lib" CONFIGURE_OPTS="--with-openssl=$HOME/openssl" PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_VERSION \
45+
&& CONFIGURE_OPTS=--enable-shared pyenv install $PYTHON_VERSION \
5546
&& pyenv global $PYTHON_VERSION \
5647
&& pip install --upgrade pip \
5748
# install pyinstaller

0 commit comments

Comments
 (0)