[docker] Update Dockerfiles with Qt 6.8.3

Author: cbentejac

docker/Dockerfile_rocky

@@ -26,9 +26,7 @@ COPY ./bin ${MESHROOM_DEV}/bin
 
 WORKDIR ${MESHROOM_DEV}
 
-RUN python3 -m pip install --upgrade --force-reinstall cx_Freeze==6.9
-
-RUN python3 setup.py install_exe -d "${MESHROOM_BUNDLE}" && \
+RUN python setup.py install_exe -d "${MESHROOM_BUNDLE}" && \
         find ${MESHROOM_BUNDLE} -name "*Qt6Web*" -delete && \
         find ${MESHROOM_BUNDLE} -name "*Qt6Designer*" -delete && \
         rm -rf ${MESHROOM_BUNDLE}/lib/PySide6/typesystems/ \
@@ -58,8 +56,8 @@ RUN make "-j$(nproc)" && \
 # Download mrSegmentation and the models, install the requirements and set all the variables
 WORKDIR ${MESHROOM_BUNDLE}
 RUN git clone https://github.com/meshroomHub/mrSegmentation.git mrSegmentation
-RUN pip install --upgrade setuptools
-RUN pip install -r mrSegmentation/requirements.txt
+RUN python -m pip install --upgrade setuptools
+RUN python -m pip install -r mrSegmentation/requirements.txt
 RUN rm mrSegmentation/requirements.txt mrSegmentation/setup.py
 ENV MESHROOM_NODES_PATH="${MESHROOM_BUNDLE}/mrSegmentation/meshroom/nodes"
 ENV PYTHONPATH="${PYTHONPATH}:${MESHROOM_BUNDLE}/mrSegmentation"

docker/Dockerfile_rocky_deps

@@ -15,8 +15,7 @@ ENV MESHROOM_DEV=/opt/Meshroom \
 
 # Install libs needed by Qt
 RUN dnf update -y
-RUN dnf install -y flex fontconfig freetype
-RUN dnf install -y glib2-devel libICE
+RUN dnf install -y flex fontconfig freetype glib2-devel libICE
 RUN dnf install -y libX11 libXext libXi libXrender libSM
 RUN dnf install -y libXt-devel mesa-libGLU-devel mesa-libOSMesa-devel mesa-libGL-devel mesa-libEGL-devel
 RUN dnf install -y zlib-devel systemd openssh-server
@@ -33,7 +32,7 @@ COPY dl/qt.run /tmp/qt
 RUN chmod +x qt.run
 RUN ./qt.run --verbose --email ${QT_CI_LOGIN} --password ${QT_CI_P} --accept-obligations --accept-licenses \
     --default-answer --platform minimal --auto-answer installationErrorWithCancel=Ignore --no-force-installations --no-default-installations --confirm-command \
-    install qt.qt6.683.gcc_64 qt.qt6.683.addons.qtcharts qt.qt6.683.addons.qt3d
+    install qt.qt6.683.linux_gcc_64 qt.qt6.683.addons.qtcharts qt.qt6.683.addons.qt3d
 RUN rm qt.run
 
 # Strip sections containing ".note.ABI.tag" from .so: https://github.com/Microsoft/WSL/issues/3023
@@ -43,4 +42,4 @@ COPY ./*requirements.txt ./setup.py ${MESHROOM_DEV}/
 
 # Install Meshroom requirements and freeze bundle
 WORKDIR "${MESHROOM_DEV}"
-RUN python3 -m pip install -r dev_requirements.txt -r requirements.txt
+RUN python -m pip install -r dev_requirements.txt -r requirements.txt

docker/Dockerfile_ubuntu

@@ -24,7 +24,7 @@ COPY ./bin ${MESHROOM_DEV}/bin
 
 WORKDIR ${MESHROOM_DEV}
 
-RUN python3 setup.py install_exe -d "${MESHROOM_BUNDLE}" && \
+RUN python setup.py install_exe -d "${MESHROOM_BUNDLE}" && \
         find ${MESHROOM_BUNDLE} -name "*Qt6Web*" -delete && \
         find ${MESHROOM_BUNDLE} -name "*Qt6Designer*" -delete && \
         rm -rf ${MESHROOM_BUNDLE}/lib/PySide6/typesystems/ \
@@ -54,8 +54,8 @@ RUN make "-j$(nproc)" && \
 # Download mrSegmentation and the models, install the requirements and set all the variables
 WORKDIR ${MESHROOM_BUNDLE}
 RUN git clone https://github.com/meshroomHub/mrSegmentation.git mrSegmentation
-RUN pip install --upgrade setuptools
-RUN pip install -r mrSegmentation/requirements.txt
+RUN python -m pip install --upgrade setuptools
+RUN python -m pip install -r mrSegmentation/requirements.txt
 RUN rm mrSegmentation/requirements.txt mrSegmentation/setup.py
 ENV MESHROOM_NODES_PATH="${MESHROOM_BUNDLE}/mrSegmentation/meshroom/nodes"
 ENV PYTHONPATH="${PYTHONPATH}:${MESHROOM_BUNDLE}/mrSegmentation"

docker/Dockerfile_ubuntu_deps

@@ -54,15 +54,15 @@ RUN apt-get install -y --no-install-recommends \
 	software-properties-common
 
 # Install Python3
-RUN apt install python3-pip -y && pip3 install --upgrade pip
+# RUN apt install python3-pip -y && pip3 install --upgrade pip
 
 # Install Qt (to build plugins)
 WORKDIR /tmp/qt
 COPY dl/qt.run /tmp/qt
 RUN chmod +x qt.run
 RUN ./qt.run --verbose --email ${QT_CI_LOGIN} --password ${QT_CI_P} --accept-obligations --accept-licenses \
     --default-answer --platform minimal --auto-answer installationErrorWithCancel=Ignore --no-force-installations --no-default-installations --confirm-command \
-    install qt.qt6.683.gcc_64 qt.qt6.683.addons.qtcharts qt.qt6.683.addons.qt3d
+    install qt.qt6.683.linux_gcc_64 qt.qt6.683.addons.qtcharts qt.qt6.683.addons.qt3d
 RUN rm qt.run
 
 # Strip sections containing ".note.ABI.tag" from .so: https://github.com/Microsoft/WSL/issues/3023
@@ -72,4 +72,4 @@ COPY ./*requirements.txt ./setup.py ${MESHROOM_DEV}/
 
 # Install Meshroom requirements and freeze bundle
 WORKDIR "${MESHROOM_DEV}"
-RUN pip install -r dev_requirements.txt -r requirements.txt
+RUN python -m pip install -r dev_requirements.txt -r requirements.txt

docker/build-all.sh

@@ -7,6 +7,6 @@ test -d docker || (
 	exit 1
 )
 
-CUDA_VERSION=12.1.0 UBUNTU_VERSION=22.04 docker/build-ubuntu.sh
+CUDA_VERSION=12.1.1 UBUNTU_VERSION=22.04 docker/build-ubuntu.sh
 
-CUDA_VERSION=12.1.0 ROCKY_VERSION=9 docker/build-rocky.sh
+CUDA_VERSION=12.1.1 ROCKY_VERSION=9 docker/build-rocky.sh

docker/extract-rocky.sh

@@ -3,7 +3,7 @@ set -ex
 
 test -z "$MESHROOM_VERSION" && MESHROOM_VERSION="$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD)"
 test -z "$AV_VERSION" && echo "AliceVision version not specified, set AV_VERSION in the environment" && exit 1
-test -z "$CUDA_VERSION" && CUDA_VERSION="12.1.0"
+test -z "$CUDA_VERSION" && CUDA_VERSION="12.1.1"
 test -z "$ROCKY_VERSION" && ROCKY_VERSION="9"
 
 test -d docker || (

docker/extract-ubuntu.sh

@@ -3,7 +3,7 @@ set -ex
 
 test -z "$MESHROOM_VERSION" && MESHROOM_VERSION="$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD)"
 test -z "$AV_VERSION" && echo "AliceVision version not specified, set AV_VERSION in the environment" && exit 1
-test -z "$CUDA_VERSION" && CUDA_VERSION="12.1.0"
+test -z "$CUDA_VERSION" && CUDA_VERSION="12.1.1"
 test -z "$UBUNTU_VERSION" && UBUNTU_VERSION="22.04"
 
 test -d docker || (