From 504ea6c337a2c36831ad9e59415713c805ef5ead Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Wed, 31 Mar 2021 11:11:29 -0400 Subject: [PATCH] ansible,jenkins: add OpenSSL 3.0.0 to sharedlibs container Add OpenSSL 3.0.0 alpha13 to the sharedlibs container. Add an entry to the VersionSelectorScript to build against it with Node.js 15 onwards. Update OpenSSL 1.1.1g to 1.1.1k. --- .../ubuntu1804_sharedlibs.Dockerfile.j2 | 20 ++++++++++++++----- jenkins/scripts/VersionSelectorScript.groovy | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 index 5fde565d1..4125cbb9c 100644 --- a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 @@ -44,15 +44,25 @@ RUN mkdir -p /tmp/openssl_1.1.0l && \ make install && \ rm -rf /tmp/openssl_1.1.0l -ENV OPENSSL111DIR /opt/openssl-1.1.1g +ENV OPENSSL111DIR /opt/openssl-1.1.1k -RUN mkdir -p /tmp/openssl_1.1.1g && \ - cd /tmp/openssl_1.1.1g && \ - curl -sL https://www.openssl.org/source/openssl-1.1.1g.tar.gz | tar zxv --strip=1 && \ +RUN mkdir -p /tmp/openssl_1.1.1k && \ + cd /tmp/openssl_1.1.1k && \ + curl -sL https://www.openssl.org/source/openssl-1.1.1k.tar.gz | tar zxv --strip=1 && \ ./config --prefix=$OPENSSL111DIR && \ make -j 6 && \ make install && \ - rm -rf /tmp/openssl_1.1.1g + rm -rf /tmp/openssl_1.1.1k + +ENV OPENSSL300DIR /opt/openssl-3.0.0 + +RUN mkdir -p /tmp/openssl_3.0.0 && \ + cd /tmp/openssl_3.0.0 && \ + curl -sL https://www.openssl.org/source/openssl-3.0.0-alpha13.tar.gz | tar zxv --strip=1 && \ + ./config --prefix=$OPENSSL300DIR && \ + make -j 6 && \ + make install && \ + rm -rf /tmp/openssl_3.0.0 ENV ZLIB12DIR /opt/zlib_1.2.11 diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 3837e790c..c72201bfc 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -93,6 +93,7 @@ def buildExclusions = [ // Shared libs docker containers ------------------------- [ /ubi81_sharedlibs/, anyType, lt(13) ], + [ /sharedlibs_openssl300/, anyType, lt(15) ], [ /sharedlibs_openssl111/, anyType, lt(11) ], [ /sharedlibs_openssl110/, anyType, lt(9) ], [ /sharedlibs_openssl110/, anyType, gte(12) ],