update OpenSSL in sharedlib containers (#2759)

Update sharedlibs container to OpenSSL 1.1.1l and OpenSSL 3.0.0+quic.
nodejs · Sep 13, 2021 · 61b074e · 61b074e
1 parent bdf06e9
commit 61b074e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
@@ -66,21 +66,21 @@ RUN mkdir -p /tmp/openssl_1.1.0l && \
     make install && \
     rm -rf /tmp/openssl_1.1.0l
 
-ENV OPENSSL111DIR /opt/openssl-1.1.1k
+ENV OPENSSL111DIR /opt/openssl-1.1.1l
 
-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 && \
+RUN mkdir -p /tmp/openssl_1.1.1l && \
+    cd /tmp/openssl_1.1.1l && \
+    curl -sL https://www.openssl.org/source/openssl-1.1.1l.tar.gz | tar zxv --strip=1 && \
     ./config --prefix=$OPENSSL111DIR && \
     make -j 6 && \
     make install && \
-    rm -rf /tmp/openssl_1.1.1k
+    rm -rf /tmp/openssl_1.1.1l
 
 ENV OPENSSL300DIR /opt/openssl-3.0.0
 
 RUN mkdir -p /tmp/openssl_3.0.0 && \
     cd /tmp/openssl_3.0.0 && \
-    git clone https://github.com/quictls/openssl.git -b openssl-3.0.0-beta1+quic --depth 1 && \
+    git clone https://github.com/quictls/openssl.git -b openssl-3.0.0+quic --depth 1 && \
     cd openssl && \
     ./config --prefix=$OPENSSL300DIR && \
     make -j 6 && \

diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2
@@ -64,21 +64,21 @@ RUN mkdir -p /tmp/openssl_1.1.0l && \
     make install && \
     rm -rf /tmp/openssl_1.1.0l
 
-ENV OPENSSL111DIR /opt/openssl-1.1.1k
+ENV OPENSSL111DIR /opt/openssl-1.1.1l
 
-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 && \
+RUN mkdir -p /tmp/openssl_1.1.1l && \
+    cd /tmp/openssl_1.1.1l && \
+    curl -sL https://www.openssl.org/source/openssl-1.1.1l.tar.gz | tar zxv --strip=1 && \
     ./config --prefix=$OPENSSL111DIR && \
     make -j 6 && \
     make install && \
-    rm -rf /tmp/openssl_1.1.1k
+    rm -rf /tmp/openssl_1.1.1l
 
 ENV OPENSSL300DIR /opt/openssl-3.0.0
 
 RUN mkdir -p /tmp/openssl_3.0.0 && \
     cd /tmp/openssl_3.0.0 && \
-    git clone https://github.com/quictls/openssl.git -b openssl-3.0.0-alpha16+quic --depth 1 && \
+    git clone https://github.com/quictls/openssl.git -b openssl-3.0.0+quic --depth 1 && \
     cd openssl && \
     ./config --prefix=$OPENSSL300DIR && \
     make -j 6 && \