admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker image: Change base to Ubuntu 22.04 LTS (jammy) (#1135)

Browse Source 
Done to upgrade from CMake 3.16.3 to 3.22.1. CMake 3.21 or newer is needed to build the Qt 6.4.1 sources with emscripten.

Also update to libidn12 to resolve an "Unable to locate package libidn11" error.
This commit is contained in:
Fredrik Orderud
2022-11-21 21:18:04 +01:00
committed by GitHub
parent 8a1268ad8b
commit edc4dc5b20
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ubuntu:focal AS stage_build
FROM ubuntu:jammy AS stage_build
ARG EMSCRIPTEN_VERSION=tot
ENV EMSDK /emsdk
@@ -56,7 +56,7 @@ RUN echo "## Aggressive optimization: Remove debug symbols" \
# -------------------------------- STAGE DEPLOY --------------------------------
# ------------------------------------------------------------------------------
FROM ubuntu:focal AS stage_deploy
FROM ubuntu:jammy AS stage_deploy
COPY --from=stage_build /emsdk /emsdk
@@ -105,7 +105,7 @@ RUN echo "## Update and install packages" \
build-essential \
make \
ant \
libidn11 \
libidn12 \
cmake \
openjdk-11-jre-headless \
# Standard Cleanup on Debian images