From edc4dc5b2094b549b129571115c5102c01151101 Mon Sep 17 00:00:00 2001
From: Fredrik Orderud <forderud@users.noreply.github.com>
Date: Mon, 21 Nov 2022 21:18:04 +0100
Subject: [PATCH] docker image: Change base to Ubuntu 22.04 LTS (jammy) (#1135)

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.
---
 docker/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index bc201e1..508d7b3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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