From 60a18f09fa547af064fb851e72b816ee25bf71a3 Mon Sep 17 00:00:00 2001
From: Ivan Komissarov <ABBAPOH@gmail.com>
Date: Fri, 16 Feb 2024 21:57:27 +0100
Subject: docker: update qt4 image to Jammy

Change-Id: Ic81ffb3a65ceb0e373b9bc2981ccd6f6b67b5df1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .github/workflows/main.yml       |  2 +-
 docker-compose.yml               |  8 ++++----
 docker/focal/test-qt4.Dockerfile | 40 ----------------------------------------
 docker/jammy/test-qt4.Dockerfile | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 docker/focal/test-qt4.Dockerfile
 create mode 100644 docker/jammy/test-qt4.Dockerfile

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fc6801e9f..6ccd36047 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -422,7 +422,7 @@ jobs:
           }
         - {
             name: 'Run Linux tests (Qt 4.8.7)',
-            image: 'focal-qt4',
+            image: 'jammy-qt4',
             suffix: 'linux',
             profile: '',
             script: './scripts/test-qt4.sh',
diff --git a/docker-compose.yml b/docker-compose.yml
index 4ccd7a58a..27d334647 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -136,12 +136,12 @@ services:
       dockerfile: docker/jammy/test-baremetal.Dockerfile
       context: .
 
-  focal-qt4:
+  jammy-qt4:
     << : *linux
-    hostname: focal-qt4
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt4-1
+    hostname: jammy-qt4
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-qt4-0
     build:
-      dockerfile: docker/focal/test-qt4.Dockerfile
+      dockerfile: docker/jammy/test-qt4.Dockerfile
       context: .
 
   leap:
diff --git a/docker/focal/test-qt4.Dockerfile b/docker/focal/test-qt4.Dockerfile
deleted file mode 100644
index e49e255f9..000000000
--- a/docker/focal/test-qt4.Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Testing Qbs with qt4
-#
-FROM ubuntu:focal
-LABEL Description="Ubuntu qt4 test environment for Qbs"
-
-# Allow colored output on command line.
-ENV TERM=xterm-color
-
-#
-# Make it possible to change UID/GID in the entrypoint script. The docker
-# container usually runs as root user on Linux hosts. When the Docker container
-# mounts a folder on the host and creates files there, those files would be
-# owned by root instead of the current user. Thus we create a user here who's
-# UID will be changed in the entrypoint script to match the UID of the current
-# host user.
-#
-ARG USER_UID=1000
-ARG USER_NAME=devel
-RUN apt-get update -qq && \
-    apt-get install -qq -y \
-        ca-certificates \
-        gosu \
-        software-properties-common \
-        sudo && \
-    groupadd -g ${USER_UID} ${USER_NAME} && \
-    useradd -s /bin/bash -u ${USER_UID} -g ${USER_NAME} -o -c "" -m ${USER_NAME} && \
-    usermod -a -G sudo ${USER_NAME} && \
-    echo "%devel         ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
-
-COPY docker/focal/entrypoint.sh /sbin/entrypoint.sh
-ENTRYPOINT ["/sbin/entrypoint.sh"]
-
-# Install baremetal toolchains and Qbs runtime dependencies.
-RUN sudo add-apt-repository ppa:gezakovacs/ppa -y && \
-    apt-get update -qq && \
-    apt-get install -qq -y \
-        build-essential \
-        libqt4-dev \
-        qt4-dev-tools
diff --git a/docker/jammy/test-qt4.Dockerfile b/docker/jammy/test-qt4.Dockerfile
new file mode 100644
index 000000000..9fa8f5d6b
--- /dev/null
+++ b/docker/jammy/test-qt4.Dockerfile
@@ -0,0 +1,40 @@
+#
+# Testing Qbs with qt4
+#
+FROM ubuntu:jammy
+LABEL Description="Ubuntu qt4 test environment for Qbs"
+
+# Allow colored output on command line.
+ENV TERM=xterm-color
+
+#
+# Make it possible to change UID/GID in the entrypoint script. The docker
+# container usually runs as root user on Linux hosts. When the Docker container
+# mounts a folder on the host and creates files there, those files would be
+# owned by root instead of the current user. Thus we create a user here who's
+# UID will be changed in the entrypoint script to match the UID of the current
+# host user.
+#
+ARG USER_UID=1000
+ARG USER_NAME=devel
+RUN apt-get update -qq && \
+    apt-get install -qq -y \
+        ca-certificates \
+        gosu \
+        software-properties-common \
+        sudo && \
+    groupadd -g ${USER_UID} ${USER_NAME} && \
+    useradd -s /bin/bash -u ${USER_UID} -g ${USER_NAME} -o -c "" -m ${USER_NAME} && \
+    usermod -a -G sudo ${USER_NAME} && \
+    echo "%devel         ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+COPY docker/entrypoint.sh /sbin/entrypoint.sh
+ENTRYPOINT ["/sbin/entrypoint.sh"]
+
+# Install baremetal toolchains and Qbs runtime dependencies.
+RUN sudo add-apt-repository ppa:ubuntuhandbook1/ppa -y && \
+    apt-get update -qq && \
+    apt-get install -qq -y \
+        build-essential \
+        libqt4-dev \
+        qt4-dev-tools
-- 
cgit v1.2.3