Skip to content

Commit

Permalink
docker image: Change base to Ubuntu 22.04 LTS (jammy) (#1135)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
forderud authored Nov 21, 2022
1 parent 8a1268a commit edc4dc5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal AS stage_build
FROM ubuntu:jammy AS stage_build

ARG EMSCRIPTEN_VERSION=tot
ENV EMSDK /emsdk
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit edc4dc5

Please sign in to comment.