From 554cf3250de8b2accfa0bcd63e824a2f965b13fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Fri, 27 Dec 2024 18:15:36 +0100 Subject: [PATCH] [docker] Fix export of `ALICEVISION_*` environment variables Variables were being overwritten every single time a new one was added. --- docker/Dockerfile_rocky_deps | 6 +++--- docker/Dockerfile_ubuntu_deps | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile_rocky_deps b/docker/Dockerfile_rocky_deps index 7e19553887..d442e37ccc 100644 --- a/docker/Dockerfile_rocky_deps +++ b/docker/Dockerfile_rocky_deps @@ -46,13 +46,13 @@ 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 +RUN echo "export ALICEVISION_VOCTREE=${AV_INSTALL}/share/aliceVision/vlfeat_K80L3.SIFT.tree" >> /etc/profile.d/alicevision.sh 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 +RUN echo "export ALICEVISION_SPHERE_DETECTION_MODEL=${AV_INSTALL}/share/aliceVision/sphereDetection_Mask-RCNN.onnx" >> /etc/profile.d/alicevision.sh 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 +RUN echo "export ALICEVISION_SEMANTIC_SEGMENTATION_MODEL=${AV_INSTALL}/share/aliceVision/fcn_resnet50.onnx" >> /etc/profile.d/alicevision.sh 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}" diff --git a/docker/Dockerfile_ubuntu_deps b/docker/Dockerfile_ubuntu_deps index 56c02ca03d..6a1a42cd09 100644 --- a/docker/Dockerfile_ubuntu_deps +++ b/docker/Dockerfile_ubuntu_deps @@ -62,13 +62,13 @@ 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 +RUN echo "export ALICEVISION_VOCTREE=${AV_INSTALL}/share/aliceVision/vlfeat_K80L3.SIFT.tree" >> /etc/profile.d/alicevision.sh 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 +RUN echo "export ALICEVISION_SPHERE_DETECTION_MODEL=${AV_INSTALL}/share/aliceVision/sphereDetection_Mask-RCNN.onnx" >> /etc/profile.d/alicevision.sh 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 +RUN echo "export ALICEVISION_SEMANTIC_SEGMENTATION_MODEL=${AV_INSTALL}/share/aliceVision/fcn_resnet50.onnx" >> /etc/profile.d/alicevision.sh 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}"