7 files changed, 32 insertions, 30 deletions
diff --git a/docker/focal/entrypoint.sh b/docker/entrypoint.sh
index 40bc5acb9..40bc5acb9 100755
--- a/docker/focal/entrypoint.sh
+++ b/docker/entrypoint.sh
diff --git a/docker/focal/Dockerfile b/docker/jammy/Dockerfile
index 917d4d0a7..cdda42202 100644
--- a/docker/focal/Dockerfile
+++ b/docker/jammy/Dockerfile
@@ -1,7 +1,7 @@
 #
 # Install Qt and Qbs for Linux
 #
-FROM ubuntu:focal
+FROM ubuntu:jammy
 LABEL Description="Ubuntu development environment for Qbs with Qt and various dependencies for testing Qbs modules and functionality"
 ARG QT_VERSION
 ARG QTCREATOR_VERSION
@@ -29,10 +29,10 @@ 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"]
 
-# Qbs build dependencies
+# # Qbs build dependencies
 RUN apt-get update -qq && \
     DEBIAN_FRONTEND="noninteractive" apt-get install -qq -y --no-install-recommends \
         bison \
@@ -40,8 +40,8 @@ RUN apt-get update -qq && \
         ca-certificates \
         capnproto \
         ccache \
-        clang-12 \
-        clang-tidy-12 \
+        clang-15 \
+        clang-tidy-15 \
         cmake \
         curl \
         flex \
@@ -72,9 +72,9 @@ RUN apt-get update -qq && \
         subversion \
         unzip \
         zip && \
-    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100 && \
-    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100 && \
-    update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-12 100 && \
+    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 100 && \
+    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-15 100 && \
+    update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-15 100 && \
     update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \
     pip install beautifulsoup4 lxml protobuf==3.19.1 pyyaml
 
@@ -85,8 +85,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ENV LLVM_INSTALL_DIR=/usr/lib/llvm-12
-
+ENV LLVM_INSTALL_DIR=/usr/lib/llvm-15
 
 #
 # Install Qt and Qbs for Linux from qt.io
diff --git a/docker/focal/test-android-no-qt.Dockerfile b/docker/jammy/test-android-no-qt.Dockerfile
index e1622043a..4e6dadf4f 100644
--- a/docker/focal/test-android-no-qt.Dockerfile
+++ b/docker/jammy/test-android-no-qt.Dockerfile
@@ -1,7 +1,7 @@
 #
 # Android SDK/NDK for testing Qbs
 #
-FROM ubuntu:focal
+FROM ubuntu:jammy
 LABEL Description="Ubuntu test environment for Qbs for Android"
 
 # 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"]
 
 # Qbs build dependencies
diff --git a/docker/focal/test-android.Dockerfile b/docker/jammy/test-android.Dockerfile
index 5f479e4fc..b17cee65b 100644
--- a/docker/focal/test-android.Dockerfile
+++ b/docker/jammy/test-android.Dockerfile
@@ -1,7 +1,7 @@
 #
 # Android SDK/NDK + Qt for Android for testing Qbs
 #
-FROM ubuntu:focal
+FROM ubuntu:jammy
 LABEL Description="Ubuntu test environment for Qbs and Qt for Android"
 
 # 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"]
 
 # Qbs build dependencies
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.
diff --git a/docker/focal/test-qt4.Dockerfile b/docker/jammy/test-qt4.Dockerfile
index e49e255f9..9fa8f5d6b 100644
--- a/docker/focal/test-qt4.Dockerfile
+++ b/docker/jammy/test-qt4.Dockerfile
@@ -1,7 +1,7 @@
 #
 # Testing Qbs with qt4
 #
-FROM ubuntu:focal
+FROM ubuntu:jammy
 LABEL Description="Ubuntu qt4 test environment for Qbs"
 
 # Allow colored output on command line.
@@ -28,11 +28,11 @@ 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.
-RUN sudo add-apt-repository ppa:gezakovacs/ppa -y && \
+RUN sudo add-apt-repository ppa:ubuntuhandbook1/ppa -y && \
     apt-get update -qq && \
     apt-get install -qq -y \
         build-essential \
diff --git a/docker/focal/test-qt6-static.Dockerfile b/docker/jammy/test-qt6-static.Dockerfile
index 61316e372..37239fd9a 100644
--- a/docker/focal/test-qt6-static.Dockerfile
+++ b/docker/jammy/test-qt6-static.Dockerfile
@@ -1,7 +1,7 @@
 #
 # Testing Qbs with static qt6
 #
-FROM ubuntu:focal
+FROM ubuntu:jammy
 LABEL Description="Ubuntu static qt6 test environment for Qbs"
 ARG QT_VERSION
 ARG QTCREATOR_VERSION
@@ -31,11 +31,11 @@ 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"]
 
 RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
-RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
+RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
 RUN cat /etc/apt/sources.list.d/kitware.list
 
 RUN apt-get update -qq && \
@@ -43,8 +43,9 @@ RUN apt-get update -qq && \
     build-essential \
     git \
     perl \
+    clang-15 \
     cmake \
-    python \
+    python3 \
     zlib1g-dev \
     libzstd-dev \
     libdbus-1-dev \
@@ -56,6 +57,7 @@ RUN apt-get update -qq && \
     libvulkan-dev \
     libicu-dev \
     libb2-dev \
+    libclang-15-dev \
     libsystemd-dev \
     libfontconfig1-dev \
     libfreetype6-dev \
@@ -101,6 +103,7 @@ RUN apt-get update -qq && \
     libxcb-damage0-dev \
     libxcb-dpms0-dev \
     libgstreamer1.0-dev \
+    llvm-15-dev \
     apt-transport-https
 
 ENV QT_HOME="/home/${USER_NAME}/qt"
@@ -119,7 +122,7 @@ USER root
 
 RUN cd ${QT_HOME}/static-build && cmake --install .
 
-FROM ubuntu:focal
+FROM ubuntu:jammy
 LABEL Description="Ubuntu static qt6 test environment for Qbs"
 ARG QT_VERSION
 ARG QTCREATOR_VERSION
@@ -153,8 +156,8 @@ RUN apt-get update -qq && \
         ca-certificates \
         capnproto \
         ccache \
-        clang-8 \
-        clang-tidy-8 \
+        clang-15 \
+        clang-tidy-15 \
         cmake \
         curl \
         flex \
@@ -186,13 +189,13 @@ RUN apt-get update -qq && \
         zip \
         libb2-1 \
         libpcre++ && \
-    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100 && \
-    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 100 && \
-    update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-8 100 && \
+    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 100 && \
+    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-15 100 && \
+    update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-15 100 && \
     update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \
     pip install beautifulsoup4 lxml protobuf pyyaml
 
-ENV LLVM_INSTALL_DIR=/usr/lib/llvm-8
+ENV LLVM_INSTALL_DIR=/usr/lib/llvm-15
 
 #
 # Install Qbs for Linux from qt.io