From d2af53cd806b7b0f0eb0ad220eef8dcecf222b9a Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 10 Sep 2021 16:45:54 +0100 Subject: [PATCH 1/2] ansible: update sharedlibs container to OpenSSL 1.1.1l --- .../templates/ubuntu1804_sharedlibs.Dockerfile.j2 | 10 +++++----- .../templates/ubuntu2004_sharedlibs.Dockerfile.j2 | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 index 4661d020c..213eea9d1 100644 --- a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 @@ -66,15 +66,15 @@ 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 diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 index 493715605..22d2e4593 100644 --- a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 @@ -64,15 +64,15 @@ 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 From 6048704bf54d98d575e9915274e55dec690d1277 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 10 Sep 2021 16:46:50 +0100 Subject: [PATCH 2/2] ansible: update sharedlibs container to OpenSSL 3.0.0+quic --- .../roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 | 2 +- .../roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 index 213eea9d1..3411c233d 100644 --- a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 @@ -80,7 +80,7 @@ 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 index 22d2e4593..77513a745 100644 --- a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 @@ -78,7 +78,7 @@ 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 && \