Update CI container images to include python3-packaging.

We already include the changes from the Conan pull request: Adding Conan and updating CMake and GCC for some images.

.github/workflows/linux_server_build.yml

@@ -1,6 +1,6 @@
 # Copyright 2013-2019 High Fidelity, Inc.
 # Copyright 2020-2022 Vircadia contributors.
-# Copyright 2021-2024 Overte e.V.
+# Copyright 2021-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 name: Linux Server CI Build
@@ -33,7 +33,7 @@ jobs:
       matrix:
         include:
           - os: debian-11
-            image: docker.io/overte/overte-server-build:0.1.3-debian-11-amd64
+            image: docker.io/overte/overte-server-build:0.1.6-debian-11-amd64
             arch: amd64
             # https://github.com/testflows/TestFlows-GitHub-Hetzner-Runners/wiki/Meta-Labels
             # self_hosted makes the Hetzner auto-scaler put up the job.
@@ -43,57 +43,57 @@ jobs:
             runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
 
           - os: debian-11
-            image: docker.io/overte/overte-server-build:0.1.3-debian-11-aarch64
+            image: docker.io/overte/overte-server-build:0.1.6-debian-11-aarch64
             arch: aarch64
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: debian-12
-            image: docker.io/overte/overte-server-build:0.1.3-debian-12-amd64
+            image: docker.io/overte/overte-server-build:0.1.6-debian-12-amd64
             arch: amd64
             runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
 
           - os: debian-12
-            image: docker.io/overte/overte-server-build:0.1.3-debian-12-aarch64
+            image: docker.io/overte/overte-server-build:0.1.6-debian-12-aarch64
             arch: aarch64
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: ubuntu-20.04
-            image: docker.io/overte/overte-server-build:0.1.3-ubuntu-20.04-amd64
+            image: docker.io/overte/overte-server-build:0.1.6-ubuntu-20.04-amd64
             arch: amd64
             runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
 
           - os: ubuntu-22.04
-            image: docker.io/overte/overte-server-build:0.1.3-ubuntu-22.04-amd64
+            image: docker.io/overte/overte-server-build:0.1.6-ubuntu-22.04-amd64
             arch: amd64
             runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
 
           - os: ubuntu-22.04
-            image: docker.io/overte/overte-server-build:0.1.3-ubuntu-22.04-aarch64
+            image: docker.io/overte/overte-server-build:0.1.6-ubuntu-22.04-aarch64
             arch: aarch64
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: ubuntu-24.04
-            image: docker.io/overte/overte-server-build:0.1.3-ubuntu-24.04-amd64
+            image: docker.io/overte/overte-server-build:0.1.6-ubuntu-24.04-amd64
             arch: amd64
             runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
 
           - os: ubuntu-24.04
-            image: docker.io/overte/overte-server-build:0.1.3-ubuntu-24.04-aarch64
+            image: docker.io/overte/overte-server-build:0.1.6-ubuntu-24.04-aarch64
             arch: aarch64
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: fedora-40
-            image: docker.io/overte/overte-server-build:0.1.4-fedora-40-amd64
+            image: docker.io/overte/overte-server-build:0.1.6-fedora-40-amd64
             arch: amd64
             runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
 
           - os: fedora-40
-            image: docker.io/overte/overte-server-build:0.1.4-fedora-40-aarch64
+            image: docker.io/overte/overte-server-build:0.1.6-fedora-40-aarch64
             arch: aarch64
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: rockylinux-9
-            image: docker.io/overte/overte-server-build:0.1.3-rockylinux-9-amd64
+            image: docker.io/overte/overte-server-build:0.1.6-rockylinux-9-amd64
             arch: amd64
             runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
 

.github/workflows/pr_build.yml

@@ -1,6 +1,6 @@
 # Copyright 2013-2019 High Fidelity, Inc.
 # Copyright 2020-2022 Vircadia contributors.
-# Copyright 2021-2024 Overte e.V.
+# Copyright 2021-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 name: Pull Request CI Build
@@ -64,8 +64,8 @@ jobs:
               runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
               arch: amd64
               build_type: full
-              apt-dependencies: python3-packaging # add missing dependencies to docker image when convenient
+            #  apt-dependencies: # add missing dependencies to docker image when convenient
-              image: docker.io/overte/overte-full-build:0.1.2-ubuntu-20.04-amd64
+              image: docker.io/overte/overte-full-build:0.1.6-ubuntu-20.04-amd64
             # Android builds are currently failing
             #- os: ubuntu-18.04
             #  build_type: android
@@ -75,8 +75,8 @@ jobs:
               runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
               arch: aarch64
               build_type: full
-              image: docker.io/overte/overte-full-build:0.1.2-ubuntu-22.04-aarch64
+              image: docker.io/overte/overte-full-build:0.1.6-ubuntu-22.04-aarch64
-              apt-dependencies: python3-packaging
+            #  apt-dependencies: # add missing dependencies to docker image when convenient
         fail-fast: false
     runs-on: ${{matrix.runner}}
     container: ${{matrix.image}}

tools/ci-scripts/deb_package/Dockerfile_build_debian-11

@@ -1,8 +1,8 @@
-# Copyright 2022-2023 Overte e.V.
+# Copyright 2022-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 # Docker file for building Overte Server
-# Example build: docker build -t overte/overte-server-build:0.1.3-debian-11 -f Dockerfile_build_debian-11 .
+# Example build: docker build -t overte/overte-server-build:0.1.6-debian-11 -f Dockerfile_build_debian-11 .
 FROM debian:bullseye
 LABEL maintainer="Julian Groß (julian.gro@overte.org)"
 LABEL description="Development image for Overte Domain server and assignment clients."
@@ -14,8 +14,12 @@ RUN echo UTC >/etc/timezone
 # Installing via dependency causes interactive hang:
 RUN apt-get update && apt-get -y install tzdata
 
+# Install Conan
+RUN apt-get -y install python3-pip
+RUN pip3 install conan
+
 # Install Overte domain-server and assignment-client build dependencies
-RUN apt-get -y install curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
+RUN apt-get -y install curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
 
 # Install CMake from Debian Backports
 RUN echo deb http://deb.debian.org/debian bullseye-backports main > /etc/apt/sources.list.d/bullseye-backports.list

tools/ci-scripts/deb_package/Dockerfile_build_debian-12

@@ -1,8 +1,8 @@
-# Copyright 2022-2023 Overte e.V.
+# Copyright 2022-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 # Docker file for building Overte Server
-# Example build: docker build -t overte/overte-server-build:0.1.3-debian-12 -f Dockerfile_build_debian-12 .
+# Example build: docker build -t overte/overte-server-build:0.1.6-debian-12 -f Dockerfile_build_debian-12 .
 FROM debian:bookworm
 LABEL maintainer="Julian Groß (julian.gro@overte.org)"
 LABEL description="Development image for Overte Domain server and assignment clients."
@@ -14,8 +14,12 @@ RUN echo UTC >/etc/timezone
 # Installing via dependency causes interactive hang:
 RUN apt-get update && apt-get -y install tzdata
 
+# Install Conan
+RUN apt-get -y install python3-pip
+RUN pip3 install --break-system-packages conan
+
 # Install Overte domain-server and assignment-client build dependencies
-RUN apt-get -y install cmake curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
+RUN apt-get -y install cmake curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
 
 # Install Overte tools build dependencies
 RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
@@ -36,4 +40,4 @@ RUN echo "export LANG=en_US.UTF-8" >> ~/.bashrc
 RUN echo "export LANGUAGE=en_US.UTF-8" >> ~/.bashrc
 
 # Install tools needed for our Github Actions Workflow
-Run apt-get -y install python3-boto3 python3-github zip
+RUN apt-get -y install python3-boto3 python3-github zip

tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-20.04

@@ -1,8 +1,8 @@
-# Copyright 2022-2023 Overte e.V.
+# Copyright 2022-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 # Docker file for building Overte Server
-# Example build: docker build -t overte/overte-server-build:0.1.3-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 .
+# Example build: docker build -t overte/overte-server-build:0.1.6-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 .
 FROM ubuntu:20.04
 LABEL maintainer="Julian Groß (julian.gro@overte.org)"
 LABEL description="Development image for Overte Domain server and assignment clients."
@@ -14,8 +14,29 @@ RUN echo UTC >/etc/timezone
 # Installing via dependency causes interactive hang:
 RUN apt-get update && apt-get -y install tzdata
 
+# Install Conan
+RUN apt-get -y install python3-pip
+RUN pip3 install conan
+
+# Install CMake from Kitware
+RUN apt-get update
+RUN apt-get -y install ca-certificates gpg wget
+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 apt-get update
+RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring
+RUN apt-get -y install cmake
+
+# Install GCC 13 from Toolchain test PPA
+RUN apt-get -y install software-properties-common
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test
+RUN apt-get update
+RUN apt-get -y install gcc-13 g++-13
+# Set GCC 13 as default
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
+
 # Install Overte domain-server and assignment-client build dependencies
-RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libharfbuzz-dev libdouble-conversion3 libxext-dev libsystemd-dev
+RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libharfbuzz-dev libdouble-conversion3 libxext-dev libsystemd-dev python3-packaging
 
 # Install tools for package creation
 RUN apt-get -y install sudo chrpath binutils dh-make

tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-22.04

@@ -1,8 +1,8 @@
-# Copyright 2022-2023 Overte e.V.
+# Copyright 2022-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 # Docker file for building Overte Server
-# Example build: docker build -t overte/overte-server-build:0.1.3-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 .
+# Example build: docker build -t overte/overte-server-build:0.1.6-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 .
 FROM ubuntu:22.04
 LABEL maintainer="Julian Groß (julian.gro@overte.org)"
 LABEL description="Development image for Overte Domain server and assignment clients."
@@ -14,8 +14,29 @@ RUN echo UTC >/etc/timezone
 # Installing via dependency causes interactive hang:
 RUN apt-get update && apt-get -y install tzdata
 
+# Install Conan
+RUN apt-get -y install python3-pip
+RUN pip3 install conan
+
+# Install CMake from Kitware
+RUN apt-get update
+RUN apt-get -y install ca-certificates gpg wget
+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/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
+RUN apt-get update
+RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring
+RUN apt-get -y install cmake
+
+# Install GCC 13 from Toolchain test PPA
+RUN apt-get -y install software-properties-common
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test
+RUN apt-get update
+RUN apt-get -y install gcc-13 g++-13
+# Set GCC 13 as default
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
+
 # Install Overte domain-server and assignment-client build dependencies
-RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
+RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
 # Install Overte tools build dependencies
 RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
 

tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-24.04

@@ -1,8 +1,8 @@
-# Copyright 2022-2024 Overte e.V.
+# Copyright 2022-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 # Docker file for building Overte Server
-# Example build: docker build -t overte/overte-server-build:0.1.3-ubuntu-24.04 -f Dockerfile_build_ubuntu-24.04 .
+# Example build: docker build -t overte/overte-server-build:0.1.6-ubuntu-24.04 -f Dockerfile_build_ubuntu-24.04 .
 FROM ubuntu:24.04
 LABEL maintainer="Julian Groß (julian.gro@overte.org)"
 LABEL description="Development image for Overte Domain server and assignment clients."
@@ -14,8 +14,12 @@ RUN echo UTC >/etc/timezone
 # Installing via dependency causes interactive hang:
 RUN apt-get update && apt-get -y install tzdata
 
+# Install Conan
+RUN apt-get -y install python3-pip
+RUN pip3 install --break-system-packages conan
+
 # Install Overte domain-server and assignment-client build dependencies
-RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-setuptools python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
+RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-setuptools python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
 # Install Overte tools build dependencies
 RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
 
@@ -35,4 +39,4 @@ RUN echo "export LANG=en_US.UTF-8" >> ~/.bashrc
 RUN echo "export LANGUAGE=en_US.UTF-8" >> ~/.bashrc
 
 # Install tools needed for our Github Actions Workflow
-Run apt-get -y install python3-boto3 python3-github zip
+RUN apt-get -y install python3-boto3 python3-github zip

tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-20.04

@@ -1,8 +1,8 @@
-# Copyright 2022-2024 Overte e.V.
+# Copyright 2022-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 # Docker file for building Overte
-# Example build: docker build -t overte/overte-full-build:0.1.2-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 .
+# Example build: docker build -t overte/overte-full-build:0.1.6-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 .
 FROM ubuntu:20.04
 LABEL maintainer="Julian Groß (julian.gro@overte.org)"
 LABEL description="Development image for full Overte builds"
@@ -14,12 +14,33 @@ RUN echo UTC >/etc/timezone
 # Installing via dependency causes interactive hang:
 RUN apt-get update && apt-get -y install tzdata
 
+# Install Conan
+RUN apt-get -y install python3-pip
+RUN pip3 install conan
+
+# Install CMake from Kitware
+RUN apt-get update
+RUN apt-get -y install ca-certificates gpg wget
+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 apt-get update
+RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring
+RUN apt-get -y install cmake
+
+# Install GCC 13 from Toolchain test PPA
+RUN apt-get -y install software-properties-common
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test
+RUN apt-get update
+RUN apt-get -y install gcc-13 g++-13
+# Set GCC 13 as default
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
+
 # Install Overte domain-server and assignment-client build dependencies
 RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
 # Install server-console build dependencies
 RUN apt-get -y install npm
 # Install Interface dependencies
-RUN apt-get -y install pkg-config libxext-dev libdouble-conversion-dev libpcre2-16-0 libpulse0 libharfbuzz-dev libnss3 libnspr4 libxdamage1 libasound2 vulkan-validationlayers libvulkan-dev libvulkan1
+RUN apt-get -y install pkg-config libxext-dev libdouble-conversion-dev libpcre2-16-0 libpulse0 libharfbuzz-dev libnss3 libnspr4 libxdamage1 libasound2 vulkan-validationlayers libvulkan-dev libvulkan1 python3-packaging
 
 # Install tools for package creation
 RUN apt-get -y install sudo chrpath binutils dh-make

tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-22.04

@@ -1,8 +1,8 @@
-# Copyright 2022-2024 Overte e.V.
+# Copyright 2022-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 # Docker file for building Overte
-# Example build: docker build -t overte/overte-full-build:0.1.2-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 .
+# Example build: docker build -t overte/overte-full-build:0.1.6-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 .
 FROM ubuntu:22.04
 LABEL maintainer="Julian Groß (julian.gro@overte.org)"
 LABEL description="Development image for full Overte builds"
@@ -14,8 +14,29 @@ RUN echo UTC >/etc/timezone
 # Installing via dependency causes interactive hang:
 RUN apt-get update && apt-get -y install tzdata
 
+# Install Conan
+RUN apt-get -y install python3-pip
+RUN pip3 install conan
+
+# Install CMake from Kitware
+RUN apt-get update
+RUN apt-get -y install ca-certificates gpg wget
+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/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
+RUN apt-get update
+RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring
+RUN apt-get -y install cmake
+
+# Install GCC 13 from Toolchain test PPA
+RUN apt-get -y install software-properties-common
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test
+RUN apt-get update
+RUN apt-get -y install gcc-13 g++-13
+# Set GCC 13 as default
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
+
 # Install Overte domain-server and assignment-client build dependencies
-RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtscript5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
+RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtscript5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging
 # Install Overte tools build dependencies
 RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
 # Install Overte Interface build dependencies

tools/ci-scripts/rpm_package/Dockerfile_build_fedora-40

@@ -1,14 +1,14 @@
-# Copyright 2022-2024 Overte e.V.
+# Copyright 2022-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 # Docker file for building Overte Server
-# Example build: docker build -t overte/overte-server-build:0.1.4-fedora-40 -f Dockerfile_build_fedora-40 .
+# Example build: docker build -t overte/overte-server-build:0.1.6-fedora-40 -f Dockerfile_build_fedora-40 .
 FROM fedora:40
 LABEL maintainer="Julian Groß (julian.gro@overte.org)"
 LABEL description="Development image for Overte Domain server and assignment clients."
 
 # Install Overte domain-server and assignment-client build dependencies
-RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3
+RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3 python3-packaging
 
 # Install additional build tools
 RUN dnf -y install zip unzip
@@ -17,4 +17,7 @@ RUN dnf -y install zip unzip
 RUN dnf -y install chrpath rpmdevtools
 
 # Install tools needed for our Github Actions Workflow
-Run dnf -y install python3-boto3 python3-pygithub
+RUN dnf -y install python3-boto3 python3-pygithub
+
+# Install Conan
+RUN dnf -y install conan

tools/ci-scripts/rpm_package/Dockerfile_build_rockylinux-9

@@ -1,8 +1,8 @@
-# Copyright 2022-2023 Overte e.V.
+# Copyright 2022-2025 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 # Docker file for building Overte Server
-# Example build: docker build -t overte/overte-server-build:0.1.3-rockylinux-9 -f Dockerfile_build_rockylinux-9 .
+# Example build: docker build -t overte/overte-server-build:0.1.6-rockylinux-9 -f Dockerfile_build_rockylinux-9 .
 FROM rockylinux:9
 LABEL maintainer="Julian Groß (julian.gro@overte.org)"
 LABEL description="Development image for Overte Domain server and assignment clients."
@@ -16,7 +16,8 @@ RUN dnf -y install epel-release
 RUN dnf config-manager --enable crb
 
 # Install Overte domain-server and assignment-client build dependencies
-RUN dnf -y install curl ninja-build git cmake gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel
+# Work around an issue with aarch64 shipping curl-minimal and us requesting curl by allowing dnf to use erase curl-minimal.
+RUN dnf -y --allowerasing install curl ninja-build git cmake gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3-packaging
 
 # Install additional build tools
 RUN dnf -y install zip unzip
@@ -26,3 +27,7 @@ RUN dnf -y install chrpath rpmdevtools
 
 # Install tools needed for our Github Actions Workflow
 Run dnf -y install python3-boto3 python3-github
+
+# Install Conan
+RUN dnf -y install python3-pip
+RUN pip3 install conan