[docker] rocky: update gxx and enable cctag

.dockerignore

@@ -0,0 +1,3 @@
+./docker/Dockerfile*
+./docker/build*
+

.github/workflows/continuous-integration.yml

@@ -21,19 +21,15 @@ on:
 jobs:
   build-linux:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        container: ["alicevision/alicevision-deps:2025.06.23-ubuntu22.04-cuda12.1.1", "alicevision/alicevision-deps:2025.06.23-rocky9-cuda12.1.1"]
     container:
-      image: ${{ matrix.container }}
+      image: "alicevision/alicevision-deps:2025.07.04-rocky9-cuda12.1.1"
     env:
       DEPS_INSTALL_DIR: /opt/AliceVision_install
       BUILD_TYPE: Release
       CTEST_OUTPUT_ON_FAILURE: 1
       ALICEVISION_ROOT: ${{ github.workspace }}/../AV_install
       ALICEVISION_SENSOR_DB: ${{ github.workspace }}/../AV_install/share/aliceVision/cameraSensors.db
       ALICEVISION_LENS_PROFILE_INFO: ""
-      BUILD_CCTAG: "${{ matrix.container == 'alicevision/alicevision-deps:2025.06.23-ubuntu22.04-cuda12.1.1' && 'ON' || 'OFF' }}"
     steps:
       - uses: actions/checkout@v1
 
@@ -57,7 +53,7 @@ jobs:
            -DALICEVISION_BUILD_SWIG_BINDING=ON \
            -DALICEVISION_USE_OPENCV=ON \
            -DALICEVISION_USE_CUDA=ON \
-           -DALICEVISION_USE_CCTAG="${BUILD_CCTAG}" \
+           -DALICEVISION_USE_CCTAG=ON \
            -DALICEVISION_USE_POPSIFT=ON \
            -DALICEVISION_USE_ALEMBIC=ON \
            -DOpenCV_DIR="${DEPS_INSTALL_DIR}/share/OpenCV" \

docker/Dockerfile_rocky_deps

@@ -11,7 +11,7 @@ LABEL maintainer="AliceVision Team alicevision-team@googlegroups.com"
 # ROCKY_VERSION=20.04
 # docker build \
 #    --build-arg CUDA_VERSION=${CUDA_VERSION} \
-#    --build-arg ROCKY_VERSION${ROCKY_VERSION} \
+#    --build-arg ROCKY_VERSION=${ROCKY_VERSION} \
 #    --tag alicevision/alicevision-deps:${AV_VERSION}-rocky${ROCKY_VERSION}-cuda${CUDA_TAG} \
 #     -f Dockerfile_rocky_deps .
 
@@ -21,21 +21,32 @@ LABEL maintainer="AliceVision Team alicevision-team@googlegroups.com"
 RUN dnf install -y 'dnf-command(config-manager)'
 RUN dnf config-manager --set-enabled devel
 RUN dnf install -y epel-release
-# RUN dnf install -y gcc-toolset-13-gcc-c++
+RUN dnf install -y gcc-toolset-12-gcc-c++
 # RUN dnf remove -y gcc-g++ gcc
-# RUN update-alternatives --install /usr/bin/gcc gcc /opt/rh/gcc-toolset-13/root/usr/bin/gcc 60
-# RUN update-alternatives --install /usr/bin/g++ g++ /opt/rh/gcc-toolset-13/root/usr/bin/g++ 60
-# RUN update-alternatives --install /usr/bin/cpp cpp /opt/rh/gcc-toolset-13/root/usr/bin/cpp 60
+RUN update-alternatives --install /usr/bin/gcc gcc /opt/rh/gcc-toolset-12/root/usr/bin/gcc 60
+RUN update-alternatives --install /usr/bin/g++ g++ /opt/rh/gcc-toolset-12/root/usr/bin/g++ 60
+RUN update-alternatives --install /usr/bin/cpp cpp /opt/rh/gcc-toolset-12/root/usr/bin/cpp 60
 RUN dnf install -y ca-certificates wget cmake git unzip
 RUN dnf install -y python3.11-devel python3.11-pip
 RUN dnf install -y pcre2-devel
 RUN dnf install -y xerces-c-devel
 RUN dnf install -y bison
 RUN dnf install -y diffutils which file
 RUN dnf install -y yasm
-RUN dnf install -y gfortran libasan libubsan
+RUN dnf install -y gcc-toolset-12-gcc-gfortran libasan libubsan
 RUN dnf update -y
-# RUN scl enable gcc-toolset-13 bash
+
+# RUN scl enable gcc-toolset-12 bash
+
+# Set it permanently
+ENV PATH="/opt/rh/gcc-toolset-12/root/usr/bin:$PATH"
+ENV CC="/opt/rh/gcc-toolset-12/root/usr/bin/gcc"
+ENV CXX="/opt/rh/gcc-toolset-12/root/usr/bin/g++"
+ENV FC="/opt/rh/gcc-toolset-12/root/usr/bin/gfortran"
+
+RUN gcc --version
+RUN g++ --version
+RUN gfortran --version
 
 RUN python3.11 -m pip install numpy==1.*
 
@@ -70,7 +81,7 @@ RUN cmake "${AV_DEV}" \
      -DALICEVISION_BUILD_DEPENDENCIES:BOOL=ON \
      -DAV_BUILD_ZLIB:BOOL=ON \
      -DAV_BUILD_ALICEVISION:BOOL=OFF \
-     -DAV_BUILD_CCTAG:BOOL=OFF \
+     -DAV_BUILD_CCTAG:BOOL=ON \
      -DCMAKE_INSTALL_PREFIX="${AV_INSTALL}"
 
 # Symlink lib64 to lib as qtOIIO expects to find OIIO in lib64
@@ -82,14 +93,19 @@ RUN ln -s /usr/bin/python3.11 /usr/bin/python
 
 RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib/x86_64-linux-gnu/libcublas.so /usr/local/cuda/lib64/libcublas.so
 
-# RUN make -j ${CPU_CORES} onnxruntime
-# RUN make -j ${CPU_CORES} turbojpeg
+
+# # RUN make -j ${CPU_CORES} cuda
 # RUN make -j ${CPU_CORES} boost
 # RUN make -j ${CPU_CORES} openexr
+# RUN make -j ${CPU_CORES} opencv
+# RUN make -j ${CPU_CORES} eigen
 # RUN make -j ${CPU_CORES} tbb
+# RUN make -j ${CPU_CORES} cctag
+# RUN make -j ${CPU_CORES} popsift
+# RUN make -j ${CPU_CORES} onnxruntime
+# RUN make -j ${CPU_CORES} turbojpeg
 # RUN make -j ${CPU_CORES} assimp
 # RUN make -j ${CPU_CORES} geogram
-# RUN make -j ${CPU_CORES} eigen
 # RUN make -j ${CPU_CORES} opengv
 # RUN make -j ${CPU_CORES} lapack
 # RUN make -j ${CPU_CORES} suitesparse
@@ -100,13 +116,10 @@ RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib/x86_64-linux-gn
 # RUN make -j ${CPU_CORES} openimageio
 # RUN make -j ${CPU_CORES} alembic
 # RUN make -j ${CPU_CORES} ffmpeg
-# RUN make -j ${CPU_CORES} opencv
 # RUN make -j ${CPU_CORES} expat
 # RUN make -j ${CPU_CORES} SWIG
 # RUN make -j ${CPU_CORES} E57Format
 
-# RUN make -j ${CPU_CORES} popsift
-# RUN make -j ${CPU_CORES} cctag
 
 RUN cmake --build . -j ${CPU_CORES} && \
    mv "${AV_INSTALL}/bin" "${AV_INSTALL}/bin-deps" && \

docker/build-rocky.sh

@@ -6,7 +6,7 @@ test -e docker/fetch.sh || {
 	exit 1
 }
 
-test -z "$AV_DEPS_VERSION" && AV_DEPS_VERSION=2025.06.23
+test -z "$AV_DEPS_VERSION" && AV_DEPS_VERSION=2025.07.04
 test -z "$AV_VERSION" && AV_VERSION="$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD)"
 test -z "$CUDA_VERSION" && CUDA_VERSION=12.1.1
 test -z "$ROCKY_VERSION" && ROCKY_VERSION=9
@@ -29,6 +29,7 @@ echo "--== BUILD DEPENDENCIES ==--"
 ## DEPENDENCIES
 docker build \
 	--rm \
+	--progress=plain \
 	--build-arg CUDA_VERSION=${CUDA_VERSION} \
 	--build-arg ROCKY_VERSION=${ROCKY_VERSION} \
 	--tag ${DEPS_DOCKER_TAG} \
@@ -47,6 +48,7 @@ echo "--== BUILD ALICEVISION ==--"
 ## ALICEVISION
 docker build \
 	--rm \
+	--progress=plain \
 	--build-arg CUDA_VERSION=${CUDA_VERSION} \
 	--build-arg ROCKY_VERSION=${ROCKY_VERSION} \
 	--build-arg AV_DEPS_VERSION=${AV_DEPS_VERSION} \

docker/build-ubuntu.sh

@@ -29,6 +29,7 @@ echo "--== BUILD DEPENDENCIES ==--"
 ## DEPENDENCIES
 docker build \
 	--rm \
+	--progress=plain \
 	--build-arg CUDA_VERSION=${CUDA_VERSION} \
 	--build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
 	--tag ${DEPS_DOCKER_TAG} \
@@ -47,6 +48,7 @@ echo "--== BUILD ALICEVISION ==--"
 ## ALICEVISION
 docker build \
 	--rm \
+	--progress=plain \
 	--build-arg CUDA_VERSION=${CUDA_VERSION} \
 	--build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
 	--build-arg AV_DEPS_VERSION=${AV_DEPS_VERSION} \

src/cmake/Dependencies.cmake

@@ -1328,6 +1328,8 @@ if(AV_BUILD_E57FORMAT)
         BINARY_DIR ${BUILD_DIR}/${E57FORMAT_TARGET}_build
         INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
         CONFIGURE_COMMAND ${CMAKE_COMMAND}
+            -DE57_BUILD_TEST:BOOL=OFF
+            -DBUILD_SHARED_LIBS:BOOL=ON
             -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
         BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL}
     )