From 016d3a99e751f354856e33441949f9f8b5c0d82a Mon Sep 17 00:00:00 2001
From: Thomas Lauf <thomas.lauf@tngtech.com>
Date: Sat, 14 Jan 2023 00:16:09 +0100
Subject: [PATCH] Update Ubuntu docker images

- Remove no longer supported version
- Add current version

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
---
 .github/workflows/tests.yaml           |  6 +++---
 docker-compose.yml                     | 16 ++++++++--------
 test/docker/{ubuntu1604 => ubuntu2204} | 18 ++++++------------
 3 files changed, 17 insertions(+), 23 deletions(-)
 rename test/docker/{ubuntu1604 => ubuntu2204} (63%)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 5d388d00..d69991f0 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -36,15 +36,15 @@ jobs:
           - name: "OpenSUSE 15.0"
             runner: ubuntu-latest
             container: opensuse1500
-          - name: "Ubuntu 16.04"
-            runner: ubuntu-latest
-            container: ubuntu1604
           - name: "Ubuntu 18.04"
             runner: ubuntu-latest
             container: ubuntu1804
           - name: "Ubuntu 20.04"
             runner: ubuntu-latest
             container: ubuntu2004
+          - name: "Ubuntu 22.04"
+            runner: ubuntu-latest
+            container: ubuntu2204
           - name: "macOS 11"
             runner: macos-11
             container: osx-11
diff --git a/docker-compose.yml b/docker-compose.yml
index 6999d4b8..c168f450 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,14 +48,6 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
-  test-ubuntu1604:
-    build:
-      context: .
-      dockerfile: test/docker/ubuntu1604
-    network_mode: "host"
-    security_opt:
-      - label=type:container_runtime_t
-    tty: true
   test-ubuntu1804:
     build:
       context: .
@@ -72,6 +64,14 @@ services:
     security_opt:
       - label=type:container_runtime_t
     tty: true
+  test-ubuntu2204:
+    build:
+      context: .
+      dockerfile: test/docker/ubuntu2204
+    network_mode: "host"
+    security_opt:
+      - label=type:container_runtime_t
+    tty: true
   test-debianstable:
     build:
       context: .
diff --git a/test/docker/ubuntu1604 b/test/docker/ubuntu2204
similarity index 63%
rename from test/docker/ubuntu1604
rename to test/docker/ubuntu2204
index 0a74107c..14aefe0f 100644
--- a/test/docker/ubuntu1604
+++ b/test/docker/ubuntu2204
@@ -1,28 +1,22 @@
-FROM ubuntu:16.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update && \
-    apt-get install -y build-essential software-properties-common && \
-    add-apt-repository -y ppa:ubuntu-toolchain-r/test
-RUN apt-get update && \
-    apt-get install -y \
+RUN apt-get update && yes | unminimize
+RUN apt-get install -y \
             asciidoctor \
             cmake \
-            gcc-snapshot \
-            g++-6 \
+            g++ \
             git \
             locales \
             man \
+            man-db \
             python3 \
             python3-dateutil \
             tzdata
 
 # Setup environment
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 \
-                        --slave /usr/bin/g++ g++ /usr/bin/g++-6 && \
-    update-alternatives --config gcc && \
-    update-alternatives --install /usr/bin/python python /usr/bin/python3 10
+RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
 RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 RUN dpkg-reconfigure -f noninteractive tzdata