From c889ba670767e35268cb84cdd6df2bb0573e858f Mon Sep 17 00:00:00 2001
From: c-ewing <59128151+c-ewing@users.noreply.github.com>
Date: Tue, 3 Dec 2024 15:16:06 -0800
Subject: [PATCH 1/8] Update Dockerfile_centos

Switch Dockerfile_centos to use ENV instead of profile.d for persisting environment variables
---
 docker/Dockerfile_centos | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile_centos b/docker/Dockerfile_centos
index 538770aaa5..a12d6171cd 100644
--- a/docker/Dockerfile_centos
+++ b/docker/Dockerfile_centos
@@ -40,10 +40,10 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release \
       -DSWIG_DIR="${AV_INSTALL}/share/swig/4.3.0" -DSWIG_EXECUTABLE="${AV_INSTALL}/bin-deps/swig" \
       "${AV_DEV}" || (cat "${AV_BUILD}/CMakeFiles/CMakeOutput.log" "${AV_BUILD}/CMakeFiles/CMakeError.log" && false)
 
-RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`; \
-    make -j"${CPU_CORES}" && \
+ENV CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`      
+RUN make -j"${CPU_CORES}" && \
     make install && \
     make bundle && \
-    rm -rf "${AV_DEV}" "${AV_BUILD}" && \
-    echo "export ALICEVISION_SENSOR_DB=${AV_BUNDLE}/share/aliceVision/cameraSensors.db" >> /etc/profile.d/alicevision.sh && \
-	echo "export ALICEVISION_ROOT=${AV_BUNDLE}" >> /etc/profile.d/alicevision.sh
+    rm -rf "${AV_DEV}" "${AV_BUILD}"
+ENV ALICEVISION_SENSOR_DB=${AV_BUNDLE}/share/aliceVision/cameraSensors.db
+ENV ALICEVISION_ROOT=${AV_BUNDLE}

From 10cc975070bbafcbbf984af872dbde8522402816 Mon Sep 17 00:00:00 2001
From: c-ewing <59128151+c-ewing@users.noreply.github.com>
Date: Tue, 3 Dec 2024 15:37:02 -0800
Subject: [PATCH 2/8] Update Dockerfile_centos_deps

Switch Dockerfile_centos_deps to use ENV instead of profile.d for persisting environment variables
---
 docker/Dockerfile_centos_deps | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile_centos_deps b/docker/Dockerfile_centos_deps
index 817f947117..72cd87431b 100644
--- a/docker/Dockerfile_centos_deps
+++ b/docker/Dockerfile_centos_deps
@@ -77,16 +77,17 @@ ENV PATH="/opt/rh/devtoolset-10/root/usr/bin:${PATH}" \
     CMAKE_VERSION=3.26.0
 
 COPY dl/vlfeat_K80L3.SIFT.tree ${AV_INSTALL}/share/aliceVision/
-RUN echo "export ALICEVISION_VOCTREE=${AV_INSTALL}/share/aliceVision/vlfeat_K80L3.SIFT.tree" > /etc/profile.d/alicevision.sh
+ENV ALICEVISION_VOCTREE=${AV_INSTALL}/share/aliceVision/vlfeat_K80L3.SIFT.tree
 
 COPY dl/sphereDetection_Mask-RCNN.onnx ${AV_INSTALL}/share/aliceVision/
-RUN echo "export ALICEVISION_SPHERE_DETECTION_MODEL=${AV_INSTALL}/share/aliceVision/sphereDetection_Mask-RCNN.onnx" > /etc/profile.d/alicevision.sh
+ENV ALICEVISION_SPHERE_DETECTION_MODEL=${AV_INSTALL}/share/aliceVision/sphereDetection_Mask-RCNN.onnx
 
 COPY dl/fcn_resnet50.onnx ${AV_INSTALL}/share/aliceVision/
-RUN echo "export ALICEVISION_SEMANTIC_SEGMENTATION_MODEL=${AV_INSTALL}/share/aliceVision/fcn_resnet50.onnx" > /etc/profile.d/alicevision.sh
+ENV ALICEVISION_SEMANTIC_SEGMENTATION_MODEL=${AV_INSTALL}/share/aliceVision/fcn_resnet50.onnx
 
 COPY docker/check-cpu.sh ${AV_DEV}/docker/check-cpu.sh
-RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` && echo "Build multithreading number of cores: ${CPU_CORES}"
+ENV CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` 
+RUN echo "Build multithreading number of cores: ${CPU_CORES}"
 
 # Manually install cmake
 WORKDIR /opt

From 5fd16577c3fe450ca8cc1a25aebf0999534ffc3e Mon Sep 17 00:00:00 2001
From: c-ewing <59128151+c-ewing@users.noreply.github.com>
Date: Tue, 3 Dec 2024 15:37:45 -0800
Subject: [PATCH 3/8] Update Dockerfile_ubuntu

Switch Dockerfile_ubuntu to use ENV instead of profile.d for persisting environment variables
---
 docker/Dockerfile_ubuntu | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile_ubuntu b/docker/Dockerfile_ubuntu
index bee3c6c52a..3618175386 100644
--- a/docker/Dockerfile_ubuntu
+++ b/docker/Dockerfile_ubuntu
@@ -40,8 +40,8 @@ WORKDIR "${AV_BUILD}"
 
 COPY docker ${AV_DEV}/docker
 
-RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`; \
-         cmake -DCMAKE_BUILD_TYPE=Release \
+ENV CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`
+RUN cmake -DCMAKE_BUILD_TYPE=Release \
         -DBUILD_SHARED_LIBS:BOOL=ON \
         -DTARGET_ARCHITECTURE=${TARGET_ARCHITECTURE} \
         -DALICEVISION_BUILD_DEPENDENCIES:BOOL=OFF \
@@ -62,6 +62,7 @@ RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`; \
         "${AV_DEV}" && \
     make install -j${CPU_CORES} && \
     make bundle && \
-    rm -rf "${AV_BUILD}" "${AV_DEV}" && \
-    echo "export ALICEVISION_SENSOR_DB=${AV_BUNDLE}/share/aliceVision/cameraSensors.db" >> /etc/profile.d/alicevision.sh && \
-    echo "export ALICEVISION_ROOT=${AV_BUNDLE}" >> /etc/profile.d/alicevision.sh
+    rm -rf "${AV_BUILD}" "${AV_DEV}"
+
+ENV ALICEVISION_SENSOR_DB=${AV_BUNDLE}/share/aliceVision/cameraSensors.db
+ENV ALICEVISION_ROOT=${AV_BUNDLE}

From 77b6438306853e2994b20579540cbb91b287c2c4 Mon Sep 17 00:00:00 2001
From: c-ewing <59128151+c-ewing@users.noreply.github.com>
Date: Tue, 3 Dec 2024 15:40:18 -0800
Subject: [PATCH 4/8] Update Dockerfile_ubuntu_deps

Switch Dockerfile_ubuntu_deps to use ENV instead of profile.d for persisting environment variables
---
 docker/Dockerfile_ubuntu_deps | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile_ubuntu_deps b/docker/Dockerfile_ubuntu_deps
index 56c02ca03d..f758f1d9ee 100644
--- a/docker/Dockerfile_ubuntu_deps
+++ b/docker/Dockerfile_ubuntu_deps
@@ -62,16 +62,17 @@ ENV AV_DEV=/opt/AliceVision_git \
     PATH="${PATH}:${AV_BUNDLE}"
 
 COPY dl/vlfeat_K80L3.SIFT.tree ${AV_INSTALL}/share/aliceVision/
-RUN echo "export ALICEVISION_VOCTREE=${AV_INSTALL}/share/aliceVision/vlfeat_K80L3.SIFT.tree" > /etc/profile.d/alicevision.sh
+ENV ALICEVISION_VOCTREE=${AV_INSTALL}/share/aliceVision/vlfeat_K80L3.SIFT.tree
 
 COPY dl/sphereDetection_Mask-RCNN.onnx ${AV_INSTALL}/share/aliceVision/
-RUN echo "export ALICEVISION_SPHERE_DETECTION_MODEL=${AV_INSTALL}/share/aliceVision/sphereDetection_Mask-RCNN.onnx" > /etc/profile.d/alicevision.sh
+ENV ALICEVISION_SPHERE_DETECTION_MODEL=${AV_INSTALL}/share/aliceVision/sphereDetection_Mask-RCNN.onnx
 
 COPY dl/fcn_resnet50.onnx ${AV_INSTALL}/share/aliceVision/
-RUN echo "export ALICEVISION_SEMANTIC_SEGMENTATION_MODEL=${AV_INSTALL}/share/aliceVision/fcn_resnet50.onnx" > /etc/profile.d/alicevision.sh
+ENV ALICEVISION_SEMANTIC_SEGMENTATION_MODEL=${AV_INSTALL}/share/aliceVision/fcn_resnet50.onnx
 
 COPY docker/check-cpu.sh ${AV_DEV}/docker/check-cpu.sh
-RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` && echo "Build multithreading number of cores: ${CPU_CORES}"
+ENV CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` 
+RUN echo "Build multithreading number of cores: ${CPU_CORES}"
 
 COPY CMakeLists.txt ${AV_DEV}/
 COPY src/cmake/Dependencies.cmake ${AV_DEV}/src/cmake/

From efab8a4f6135bb8aa9c7938228385a69de6a143a Mon Sep 17 00:00:00 2001
From: c-ewing <59128151+c-ewing@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:33:26 -0800
Subject: [PATCH 5/8] Update Dockerfile_centos

Revert CPU_CORES change as ENV cannot be dynamically set based on a script.
---
 docker/Dockerfile_centos | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile_centos b/docker/Dockerfile_centos
index a12d6171cd..b02837ff6b 100644
--- a/docker/Dockerfile_centos
+++ b/docker/Dockerfile_centos
@@ -39,9 +39,9 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release \
       -DALICEVISION_USE_POPSIFT=ON -DALICEVISION_USE_CUDA=ON -DALICEVISION_USE_ONNX_GPU=OFF -DALICEVISION_BUILD_DOC=OFF \
       -DSWIG_DIR="${AV_INSTALL}/share/swig/4.3.0" -DSWIG_EXECUTABLE="${AV_INSTALL}/bin-deps/swig" \
       "${AV_DEV}" || (cat "${AV_BUILD}/CMakeFiles/CMakeOutput.log" "${AV_BUILD}/CMakeFiles/CMakeError.log" && false)
-
-ENV CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`      
-RUN make -j"${CPU_CORES}" && \
+      
+RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`; \
+    make -j"${CPU_CORES}" && \
     make install && \
     make bundle && \
     rm -rf "${AV_DEV}" "${AV_BUILD}"

From 9a6403ec987c53890ca73d381188cb1f0edca81b Mon Sep 17 00:00:00 2001
From: c-ewing <59128151+c-ewing@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:38:42 -0800
Subject: [PATCH 6/8] Update Dockerfile_centos_deps

Revert CPU_CORES change as ENV cannot be dynamically set based on a script.
---
 docker/Dockerfile_centos_deps | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile_centos_deps b/docker/Dockerfile_centos_deps
index 72cd87431b..7268b6d43d 100644
--- a/docker/Dockerfile_centos_deps
+++ b/docker/Dockerfile_centos_deps
@@ -86,8 +86,7 @@ COPY dl/fcn_resnet50.onnx ${AV_INSTALL}/share/aliceVision/
 ENV ALICEVISION_SEMANTIC_SEGMENTATION_MODEL=${AV_INSTALL}/share/aliceVision/fcn_resnet50.onnx
 
 COPY docker/check-cpu.sh ${AV_DEV}/docker/check-cpu.sh
-ENV CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` 
-RUN echo "Build multithreading number of cores: ${CPU_CORES}"
+RUN echo "Build multithreading number of cores: `${AV_DEV}/docker/check-cpu.sh`"
 
 # Manually install cmake
 WORKDIR /opt
@@ -145,6 +144,7 @@ RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib64/libcublas.so
 # RUN make -j ${CPU_CORES} cctag
 # RUN make -j ${CPU_CORES} popsift
 
-RUN cmake --build . -j ${CPU_CORES} && \
+RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` && \
+    cmake --build . -j ${CPU_CORES} && \
     mv "${AV_INSTALL}/bin" "${AV_INSTALL}/bin-deps" && \
     rm -rf "${AV_BUILD}"

From d3aa324734da860934fab29f2e27f82e6be81005 Mon Sep 17 00:00:00 2001
From: c-ewing <59128151+c-ewing@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:39:40 -0800
Subject: [PATCH 7/8] Update Dockerfile_ubuntu

Revert CPU_CORES change as ENV cannot be dynamically set based on a script.
---
 docker/Dockerfile_ubuntu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile_ubuntu b/docker/Dockerfile_ubuntu
index 3618175386..0ef58d16fc 100644
--- a/docker/Dockerfile_ubuntu
+++ b/docker/Dockerfile_ubuntu
@@ -40,8 +40,8 @@ WORKDIR "${AV_BUILD}"
 
 COPY docker ${AV_DEV}/docker
 
-ENV CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`
-RUN cmake -DCMAKE_BUILD_TYPE=Release \
+RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`; \
+         cmake -DCMAKE_BUILD_TYPE=Release \
         -DBUILD_SHARED_LIBS:BOOL=ON \
         -DTARGET_ARCHITECTURE=${TARGET_ARCHITECTURE} \
         -DALICEVISION_BUILD_DEPENDENCIES:BOOL=OFF \

From 6d33a3d475b7aaf293eae14aa360d9327df309a2 Mon Sep 17 00:00:00 2001
From: c-ewing <59128151+c-ewing@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:41:21 -0800
Subject: [PATCH 8/8] Update Dockerfile_ubuntu_deps

Revert CPU_CORES change as ENV cannot be dynamically set based on a script.
---
 docker/Dockerfile_ubuntu_deps | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile_ubuntu_deps b/docker/Dockerfile_ubuntu_deps
index f758f1d9ee..6aa7051655 100644
--- a/docker/Dockerfile_ubuntu_deps
+++ b/docker/Dockerfile_ubuntu_deps
@@ -71,8 +71,7 @@ COPY dl/fcn_resnet50.onnx ${AV_INSTALL}/share/aliceVision/
 ENV ALICEVISION_SEMANTIC_SEGMENTATION_MODEL=${AV_INSTALL}/share/aliceVision/fcn_resnet50.onnx
 
 COPY docker/check-cpu.sh ${AV_DEV}/docker/check-cpu.sh
-ENV CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` 
-RUN echo "Build multithreading number of cores: ${CPU_CORES}"
+RUN echo "Build multithreading number of cores: `${AV_DEV}/docker/check-cpu.sh`"
 
 COPY CMakeLists.txt ${AV_DEV}/
 COPY src/cmake/Dependencies.cmake ${AV_DEV}/src/cmake/
@@ -120,6 +119,7 @@ RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib/x86_64-linux-gn
 # RUN make -j ${CPU_CORES} popsift
 # RUN make -j ${CPU_CORES} cctag
 
-RUN cmake --build . -j ${CPU_CORES} && \
+RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh` && \
+    cmake --build . -j ${CPU_CORES} && \
     mv "${AV_INSTALL}/bin" "${AV_INSTALL}/bin-deps" && \
     rm -rf "${AV_BUILD}"