From cea7768583fa0336f252dc9bcb5fedeb1b1289bd Mon Sep 17 00:00:00 2001 From: Peio Rigaux Date: Mon, 22 Sep 2025 14:46:53 +0200 Subject: [PATCH] Add QT proprietary versions for Linux to Dockerfile and docker image. Add QT proprietary 5.15.14, 5.15.19, 6.8.1, 6.8.3 in Dockerfile. Modified CI and dockerfile to use qtchooser, to keep the same behaviour without having to rely on a specific entrypoint. Split opensource versions from proprietary versions by using a different directory. --- docker-files/bc-dev-ubuntu-22-04-lts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docker-files/bc-dev-ubuntu-22-04-lts b/docker-files/bc-dev-ubuntu-22-04-lts index d4281532b..b0bd6066f 100644 --- a/docker-files/bc-dev-ubuntu-22-04-lts +++ b/docker-files/bc-dev-ubuntu-22-04-lts @@ -7,6 +7,7 @@ FROM ubuntu:22.04 # Qt on Ubuntu 22.04 is too old. Use a downloader. ARG QT_VERSION=5.15.2 ARG QT6_VERSION=6.9.1 + #Do not use it. It seems that it cannot be used from python command. #ARG QT_MODULES=qtnetworkauth qtquick3d qtmultimedia qt5compat qtshadertools @@ -42,7 +43,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ARG DEBIAN_FRONTEND=noninteractive ENV SHELL=/bin/bash -#ENV PS1='\[\e[33m\]\u@bc-dev-ubuntu-20-04>\[\e[0m\] ' +#ENV PS1='\[\e[33m\]\u@bc-dev-ubuntu-22-04>\[\e[0m\] ' # Install common general tools RUN apt-get update && \ @@ -87,10 +88,10 @@ RUN sudo apt install --upgrade -y python3-setuptools # installation is split because there is a way where some modules are not downloaded in the first attempt. RUN sudo apt install -y python3-py7zr RUN sudo pip3 install --upgrade aqtinstall -RUN sudo python3 -m aqt install-qt linux desktop $QT_VERSION -O /opt/Qt -RUN sudo python3 -m aqt install-qt linux desktop $QT_VERSION -O /opt/Qt --noarchives -m qtnetworkauth qtquick3d -RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt -RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt --noarchives -m qtnetworkauth qtquick3d qtmultimedia qt5compat qtshadertools +RUN sudo python3 -m aqt install-qt linux desktop $QT_VERSION -O /opt/Qt/opensource +RUN sudo python3 -m aqt install-qt linux desktop $QT_VERSION -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d +RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt/opensource +RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qtmultimedia qt5compat qtshadertools RUN sudo chown -R bc:bc /opt/Qt/ @@ -163,4 +164,4 @@ RUN qtchooser -install 6.8.1-proprietary /opt/Qt/proprietary/6.8.1/gcc_64/bin/qm RUN qtchooser -install 6.8.3-proprietary /opt/Qt/proprietary/6.8.3/gcc_64/bin/qmake RUN qtchooser -install 6.9.1-proprietary /opt/Qt/proprietary/6.9.1/gcc_64/bin/qmake -cmd bash +cmd bash \ No newline at end of file