From 2453f39e058e6f7a76a67e9f364867f7479eb6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 26 Apr 2022 16:20:05 +0200 Subject: [PATCH 1/2] ansible: add ICU 71 to `sharedlibs` images Refs: https://github.com/nodejs/node-v8/issues/223 --- .../roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 | 3 ++- .../roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 index 67e397051..c4f2b54a5 100644 --- a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 @@ -43,7 +43,8 @@ ENV ICU64DIR=/opt/icu-64 \ ICU65DIR=/opt/icu-65 \ ICU67DIR=/opt/icu-67 \ ICU68DIR=/opt/icu-68 \ - ICU69DIR=/opt/icu-69 + ICU69DIR=/opt/icu-69 \ + ICU71DIR=/opt/icu-71 RUN for ICU_ENV in $(env | grep ICU..DIR); do \ ICU_PREFIX=$(echo $ICU_ENV | cut -d '=' -f 2) && \ diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 index df7ab789f..854effe01 100644 --- a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 @@ -39,7 +39,8 @@ ENV ICU64DIR=/opt/icu-64.1 \ ICU65DIR=/opt/icu-65.1 \ ICU67DIR=/opt/icu-67.1 \ ICU68DIR=/opt/icu-68.2 \ - ICU69DIR=/opt/icu-69.1 + ICU69DIR=/opt/icu-69.1 \ + ICU71DIR=/opt/icu-71.1 RUN for ICU_ENV in $(env | grep ICU..DIR); do \ ICU_PREFIX=$(echo $ICU_ENV | cut -d '=' -f 2) && \ From 32c8f2916375dd708c17e42a858024b8c0d71011 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Tue, 26 Apr 2022 17:40:18 +0100 Subject: [PATCH 2/2] ansible: update zlib in `sharedlibs` containers The referenced zlib 1.2.11 tarball no longer exists. Update to 1.2.12. Contains a refactor so we only have to update the version in one place in the future. --- .../templates/ubuntu1804_sharedlibs.Dockerfile.j2 | 11 ++++++----- .../templates/ubuntu2004_sharedlibs.Dockerfile.j2 | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 index c4f2b54a5..2efbb4d82 100644 --- a/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2 @@ -84,15 +84,16 @@ RUN mkdir -p /tmp/openssl-$OPENSSL3VER && \ make install && \ rm -rf /tmp/openssl-$OPENSSL3VER -ENV ZLIB12DIR /opt/zlib_1.2.11 +ENV ZLIBVER 1.2.12 +ENV ZLIB12DIR /opt/zlib_$ZLIBVER -RUN mkdir -p /tmp/zlib_1.2.11 && \ - cd /tmp/zlib_1.2.11 && \ - curl -sL https://zlib.net/zlib-1.2.11.tar.gz | tar zxv --strip=1 && \ +RUN mkdir -p /tmp/zlib_$ZLIBVER && \ + cd /tmp/zlib_$ZLIBVER && \ + curl -sL https://zlib.net/zlib-$ZLIBVER.tar.gz | tar zxv --strip=1 && \ ./configure --prefix=$ZLIB12DIR && \ make -j 6 && \ make install && \ - rm -rf /tmp/zlib_1.2.11 + rm -rf /tmp/zlib_$ZLIBVER VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 index 854effe01..122a03180 100644 --- a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 +++ b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 @@ -82,15 +82,16 @@ RUN mkdir -p /tmp/openssl-$OPENSSL3VER && \ make install && \ rm -rf /tmp/openssl-$OPENSSL3VER -ENV ZLIB12DIR /opt/zlib_1.2.11 +ENV ZLIBVER 1.2.12 +ENV ZLIB12DIR /opt/zlib_$ZLIBVER -RUN mkdir -p /tmp/zlib_1.2.11 && \ - cd /tmp/zlib_1.2.11 && \ - curl -sL https://zlib.net/zlib-1.2.11.tar.gz | tar zxv --strip=1 && \ +RUN mkdir -p /tmp/zlib_$ZLIBVER && \ + cd /tmp/zlib_$ZLIBVER && \ + curl -sL https://zlib.net/zlib-$ZLIBVER.tar.gz | tar zxv --strip=1 && \ ./configure --prefix=$ZLIB12DIR && \ make -j 6 && \ make install && \ - rm -rf /tmp/zlib_1.2.11 + rm -rf /tmp/zlib_$ZLIBVER VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache