Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ansible: add ICU 71 to sharedlibs images #2934

Merged
merged 2 commits into from
Apr 28, 2022
Merged

ansible: add ICU 71 to sharedlibs images #2934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2453f39
ansible: add ICU 71 to `sharedlibs` images
targos Apr 26, 2022
32c8f29
ansible: update zlib in `sharedlibs` containers
richardlau Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) && \
Expand Down Expand Up @@ -83,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

Expand Down
14 changes: 8 additions & 6 deletions ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) && \
Expand Down Expand Up @@ -81,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

Expand Down