Skip to content

Commit 371bb76

Browse files
authored
ansible,jenkins: add OpenSSL 3.0.0 to sharedlibs container (#2601)
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. Refs: #2584
1 parent 01dc507 commit 371bb76

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,25 @@ RUN mkdir -p /tmp/openssl_1.1.0l && \
4444
make install && \
4545
rm -rf /tmp/openssl_1.1.0l
4646

47-
ENV OPENSSL111DIR /opt/openssl-1.1.1g
47+
ENV OPENSSL111DIR /opt/openssl-1.1.1k
4848

49-
RUN mkdir -p /tmp/openssl_1.1.1g && \
50-
cd /tmp/openssl_1.1.1g && \
51-
curl -sL https://www.openssl.org/source/openssl-1.1.1g.tar.gz | tar zxv --strip=1 && \
49+
RUN mkdir -p /tmp/openssl_1.1.1k && \
50+
cd /tmp/openssl_1.1.1k && \
51+
curl -sL https://www.openssl.org/source/openssl-1.1.1k.tar.gz | tar zxv --strip=1 && \
5252
./config --prefix=$OPENSSL111DIR && \
5353
make -j 6 && \
5454
make install && \
55-
rm -rf /tmp/openssl_1.1.1g
55+
rm -rf /tmp/openssl_1.1.1k
56+
57+
ENV OPENSSL300DIR /opt/openssl-3.0.0
58+
59+
RUN mkdir -p /tmp/openssl_3.0.0 && \
60+
cd /tmp/openssl_3.0.0 && \
61+
curl -sL https://www.openssl.org/source/openssl-3.0.0-alpha13.tar.gz | tar zxv --strip=1 && \
62+
./config --prefix=$OPENSSL300DIR && \
63+
make -j 6 && \
64+
make install && \
65+
rm -rf /tmp/openssl_3.0.0
5666

5767
ENV ZLIB12DIR /opt/zlib_1.2.11
5868

jenkins/scripts/VersionSelectorScript.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def buildExclusions = [
9393

9494
// Shared libs docker containers -------------------------
9595
[ /ubi81_sharedlibs/, anyType, lt(13) ],
96+
[ /sharedlibs_openssl300/, anyType, lt(15) ],
9697
[ /sharedlibs_openssl111/, anyType, lt(11) ],
9798
[ /sharedlibs_openssl110/, anyType, lt(9) ],
9899
[ /sharedlibs_openssl110/, anyType, gte(12) ],

0 commit comments

Comments
 (0)