From e62883e24ecdcad947cb6f1ff10c47d893bb8dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Alvergnat?= Date: Sat, 9 May 2020 11:46:40 +0200 Subject: [PATCH] Use libssl-dev package on Ubuntu >= 16.04 --- Dockerfile-py3-focal-amd64 | 11 +---------- Dockerfile-py3-xenial-amd64 | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/Dockerfile-py3-focal-amd64 b/Dockerfile-py3-focal-amd64 index 5184bcc..b100b85 100644 --- a/Dockerfile-py3-focal-amd64 +++ b/Dockerfile-py3-focal-amd64 @@ -33,16 +33,7 @@ RUN \ uuid-dev \ #upx upx \ - # required because openSSL on Ubuntu 12.04 and 14.04 run out of support versions of OpenSSL - && mkdir openssl \ - && cd openssl \ - # latest version, there won't be anything newer for this - && wget https://www.openssl.org/source/openssl-1.0.2u.tar.gz \ - && tar -xzvf openssl-1.0.2u.tar.gz \ - && cd openssl-1.0.2u \ - && ./config --prefix=$HOME/openssl --openssldir=$HOME/openssl shared zlib \ - && make \ - && make install \ + libssl-dev \ # install pyenv && echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \ && echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \ diff --git a/Dockerfile-py3-xenial-amd64 b/Dockerfile-py3-xenial-amd64 index 2f35294..8520db0 100644 --- a/Dockerfile-py3-xenial-amd64 +++ b/Dockerfile-py3-xenial-amd64 @@ -33,16 +33,7 @@ RUN \ uuid-dev \ #upx upx \ - # required because openSSL on Ubuntu 12.04 and 14.04 run out of support versions of OpenSSL - && mkdir openssl \ - && cd openssl \ - # latest version, there won't be anything newer for this - && wget https://www.openssl.org/source/openssl-1.0.2u.tar.gz \ - && tar -xzvf openssl-1.0.2u.tar.gz \ - && cd openssl-1.0.2u \ - && ./config --prefix=$HOME/openssl --openssldir=$HOME/openssl shared zlib \ - && make \ - && make install \ + libssl-dev \ # install pyenv && echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \ && echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \