From d5ee0b3221b68879aed6cd151f8cead92d2f964b Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 13 Jun 2024 14:33:03 +0100 Subject: [PATCH 1/2] ansible: remove ICU 68 from sharedlibs containers The earliest supported Node.js version we still build in the CI is 18.x. For Node.js 18.x, the minimum supported version of ICU is 69. --- .../roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 index 7e053432b..07b7bf8cd 100644 --- a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 @@ -35,8 +35,7 @@ RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }} RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }} -ENV ICU68DIR=/opt/icu-68.1 \ - ICU69DIR=/opt/icu-69.1 \ +ENV ICU69DIR=/opt/icu-69.1 \ ICU71DIR=/opt/icu-71.1 \ ICU73DIR=/opt/icu-73.2 From 719daecd26ab07f3bec7e50e6ab8b074ac165dd4 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 13 Jun 2024 14:40:56 +0100 Subject: [PATCH 2/2] ansible: add OpenSSL 3.2 to sharedlibs containers --- .../templates/ubuntu2204_sharedlibs.Dockerfile.j2 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 index 07b7bf8cd..28b043bb9 100644 --- a/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2204_sharedlibs.Dockerfile.j2 @@ -111,6 +111,17 @@ RUN mkdir -p /tmp/openssl-$OPENSSL31VER && \ make install && \ rm -rf /tmp/openssl-$OPENSSL31VER +ENV OPENSSL32VER 3.2.2 +ENV OPENSSL32DIR /opt/openssl-$OPENSSL32VER + +RUN mkdir -p /tmp/openssl-$OPENSSL32VER && \ + cd /tmp/openssl-$OPENSSL32VER && \ + curl -sL https://www.openssl.org/source/openssl-$OPENSSL32VER.tar.gz | tar zxv --strip=1 && \ + ./config --prefix=$OPENSSL32DIR && \ + make -j $JOBS && \ + make install && \ + rm -rf /tmp/openssl-$OPENSSL32VER + ENV ZLIBVER 1.2.13 ENV ZLIB12DIR /opt/zlib_$ZLIBVER