docker: upgrade baremetal image to Jammy

Change-Id: I8881561219215c534ec41261511d3210faa815d6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 21 insertions, 21 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0fe723045..fc6801e9f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -463,23 +463,23 @@ jobs:
     - name: Unpack artifact
       run: mkdir -p release/install-root/ && tar xzf qbs-linux-${{ github.run_id }}.tar.gz -C release/install-root/
     - name: Pull the Docker Image
-      run: docker-compose pull focal-baremetal
-    - name: arm-none-eabi-gcc-9_2
-      run: QBS_AUTOTEST_PROFILE=arm-none-eabi-gcc-9_2 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
+      run: docker-compose pull jammy-baremetal
+    - name: arm-none-eabi-gcc-10_3
+      run: QBS_AUTOTEST_PROFILE=arm-none-eabi-gcc-10_3 docker-compose run jammy-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
     - name: avr-gcc-5_4
-      run: QBS_AUTOTEST_PROFILE=avr-gcc-5_4 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
+      run: QBS_AUTOTEST_PROFILE=avr-gcc-5_4 docker-compose run jammy-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
     - name: msp430-gcc-4_6
-      run: QBS_AUTOTEST_PROFILE=msp430-gcc-4_6 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
-    - name: xtensa-lx106-elf-gcc-9_2
-      run: QBS_AUTOTEST_PROFILE=xtensa-lx106-elf-gcc-9_2 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
-    - name: riscv64-unknown-elf-gcc-9_3
-      run: QBS_AUTOTEST_PROFILE=riscv64-unknown-elf-gcc-9_3 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
-    - name: sdcc-3_8_0-mcs51
-      run: QBS_AUTOTEST_PROFILE=sdcc-3_8_0-mcs51 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
-    - name: sdcc-3_8_0-stm8
-      run: QBS_AUTOTEST_PROFILE=sdcc-3_8_0-stm8 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
-    - name: sdcc-3_8_0-hcs8
-      run: QBS_AUTOTEST_PROFILE=sdcc-3_8_0-hcs8 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
+      run: QBS_AUTOTEST_PROFILE=msp430-gcc-4_6 docker-compose run jammy-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
+    - name: riscv64-unknown-elf-gcc-10_2
+      run: QBS_AUTOTEST_PROFILE=riscv64-unknown-elf-gcc-10_2 docker-compose run jammy-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
+    - name: sdcc-4_0_0-hcs8
+      run: QBS_AUTOTEST_PROFILE=sdcc-4_0_0-hcs8 docker-compose run jammy-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
+    - name: sdcc-4_0_0-mcs51
+      run: QBS_AUTOTEST_PROFILE=sdcc-4_0_0-mcs51 docker-compose run jammy-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
+    - name: sdcc-4_0_0-stm8
+      run: QBS_AUTOTEST_PROFILE=sdcc-4_0_0-stm8 docker-compose run jammy-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
+    - name: xtensa-lx106-elf-gcc-10_3
+      run: QBS_AUTOTEST_PROFILE=xtensa-lx106-elf-gcc-10_3 docker-compose run jammy-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin
 
   test-baremetal-windows:
     name: Run Baremetal tests (Windows)
diff --git a/docker-compose.yml b/docker-compose.yml
index faaf764f1..4ccd7a58a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -128,12 +128,12 @@ services:
       args:
         ANDROID_NDK_VERSION: 23.0.7599858
 
-  focal-baremetal:
+  jammy-baremetal:
     << : *linux
-    hostname: focal-baremetal
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-baremetal-4
+    hostname: jammy-baremetal
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-baremetal-0
     build:
-      dockerfile: docker/focal/test-baremetal.Dockerfile
+      dockerfile: docker/jammy/test-baremetal.Dockerfile
       context: .
 
   focal-qt4:
diff --git a/docker/focal/test-baremetal.Dockerfile b/docker/jammy/test-baremetal.Dockerfile
index 5bef208ca..774885797 100644
--- a/docker/focal/test-baremetal.Dockerfile
+++ b/docker/jammy/test-baremetal.Dockerfile
@@ -1,7 +1,7 @@
 #
 # Baremetal toolchains for testing Qbs
 #
-FROM ubuntu:focal
+FROM ubuntu:jammy
 LABEL Description="Ubuntu baremetal test environment for Qbs"
 
 # Allow colored output on command line.
@@ -27,7 +27,7 @@ RUN apt-get update -qq && \
     usermod -a -G sudo ${USER_NAME} && \
     echo "%devel         ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
 
-COPY docker/focal/entrypoint.sh /sbin/entrypoint.sh
+COPY docker/entrypoint.sh /sbin/entrypoint.sh
 ENTRYPOINT ["/sbin/entrypoint.sh"]
 
 # Install baremetal toolchains and Qbs runtime dependencies.