ENH: improve Dockerfile portability and robustness

- Use FOAM_ETC environment variable instead of hardcoded OpenFOAM path
- Make binary/library copying more flexible across OpenFOAM versions

Author: Moaad Khamlich

dockerfiles/Dockerfile

@@ -41,7 +41,7 @@ RUN git clone https://github.com/mathLab/ITHACA-FV.git && \
     chown -R $USER:$USER /home/$USER
 
 # Environment variables for bashrc
-ARG of_var="source /usr/lib/openfoam/openfoam2412/etc/bashrc"
+ARG of_var="source \$FOAM_ETC/bashrc"
 ARG ithaca_var="source /opt/ITHACA-FV/etc/bashrc"
 
 # Update bashrc with OpenFOAM and ITHACA-FV sources
@@ -52,22 +52,26 @@ RUN echo $of_var >> /etc/bash.bashrc && \
 USER $USER
 
 # Build ITHACA-FV with architecture-specific flags
-RUN /bin/bash -c "source /usr/lib/openfoam/openfoam2412/etc/bashrc && \
+RUN /bin/bash -c "source \$FOAM_ETC/bashrc  && \
     cd ITHACA-FV && \
     git submodule update --init && \
     source etc/bashrc && \
     if [ \"$TARGETARCH\" = \"amd64\" ]; then \
         ./Allwmake -taumq -j 4; \
     else \
-        ./Allwmake -tau -j 4; \
+        ./Allwmake -au -j 4; \
     fi"
 
 # Copy binaries and libraries to system paths (as root)
 USER root
-RUN if [ -d "/home/$USER/OpenFOAM/$USER-openfoam2412/platforms/linux64GccDPInt32Opt/bin" ]; then \
-        cp -r /home/$USER/OpenFOAM/$USER-openfoam2412/platforms/linux64GccDPInt32Opt/bin/* /usr/local/bin/ || true; \
-        cp -r /home/$USER/OpenFOAM/$USER-openfoam2412/platforms/linux64GccDPInt32Opt/lib/* /usr/local/lib/ || true; \
-    fi
+RUN for openfoam_dir in /home/$USER/OpenFOAM/$USER-openfoam*/platforms/*/; do \
+        if [ -d "$openfoam_dir/bin" ]; then \
+            cp -r "$openfoam_dir/bin"/* /usr/local/bin/ 2>/dev/null || true; \
+        fi; \
+        if [ -d "$openfoam_dir/lib" ]; then \
+            cp -r "$openfoam_dir/lib"/* /usr/local/lib/ 2>/dev/null || true; \
+        fi; \
+    done
 
 # Final setup
 USER $USER

dockerfiles/OF2412/amd64-deps/Dockerfile

@@ -27,4 +27,15 @@ conda install -y -c conda-forge muq cmake pybind11 && \
 conda clean -y --all
 ENV TORCH_LIBRARIES=/libtorch
 ENV MUQ_LIBRARIES=/root/miniconda3
+
+# Export OpenFOAM environment variables for use in subsequent builds
+RUN /bin/bash -c "source /usr/lib/openfoam/openfoam2412/etc/bashrc && \
+    echo 'export FOAM_ETC=${FOAM_ETC}' >> /etc/environment && \
+    echo 'export FOAM_APP=${FOAM_APP}' >> /etc/environment && \
+    echo 'export FOAM_APPBIN=${FOAM_APPBIN}' >> /etc/environment && \
+    echo 'export FOAM_LIBBIN=${FOAM_LIBBIN}' >> /etc/environment && \
+    echo 'export FOAM_SRC=${FOAM_SRC}' >> /etc/environment && \
+    echo 'export WM_PROJECT_DIR=${WM_PROJECT_DIR}' >> /etc/environment"
+
+ENV FOAM_ETC=/usr/lib/openfoam/openfoam2412/etc
 RUN echo 'source /usr/lib/openfoam/openfoam2412/etc/bashrc' >> ~/.bashrc

dockerfiles/OF2412/arm64-deps/Dockerfile

@@ -28,5 +28,16 @@ make -j4 && make install && \
 cd / && rm -rf /tmp/muq2 && \
 conda clean -y --all
 ENV MUQ_LIBRARIES=/root/miniconda3
+
+# Export OpenFOAM environment variables for use in subsequent builds
+RUN /bin/bash -c "source /usr/lib/openfoam/openfoam2412/etc/bashrc && \
+    echo 'export FOAM_ETC=${FOAM_ETC}' >> /etc/environment && \
+    echo 'export FOAM_APP=${FOAM_APP}' >> /etc/environment && \
+    echo 'export FOAM_APPBIN=${FOAM_APPBIN}' >> /etc/environment && \
+    echo 'export FOAM_LIBBIN=${FOAM_LIBBIN}' >> /etc/environment && \
+    echo 'export FOAM_SRC=${FOAM_SRC}' >> /etc/environment && \
+    echo 'export WM_PROJECT_DIR=${WM_PROJECT_DIR}' >> /etc/environment"
+
+ENV FOAM_ETC=/usr/lib/openfoam/openfoam2412/etc
 RUN echo 'source /usr/lib/openfoam/openfoam2412/etc/bashrc' >> ~/.bashrc 
 

dockerfiles/OF2506/amd64-deps/Dockerfile

@@ -27,4 +27,15 @@ conda install -y -c conda-forge muq cmake pybind11 && \
 conda clean -y --all
 ENV TORCH_LIBRARIES=/libtorch
 ENV MUQ_LIBRARIES=/root/miniconda3
+
+# Export OpenFOAM environment variables for use in subsequent builds
+RUN /bin/bash -c "source /usr/lib/openfoam/openfoam2506/etc/bashrc && \
+    echo 'export FOAM_ETC=${FOAM_ETC}' >> /etc/environment && \
+    echo 'export FOAM_APP=${FOAM_APP}' >> /etc/environment && \
+    echo 'export FOAM_APPBIN=${FOAM_APPBIN}' >> /etc/environment && \
+    echo 'export FOAM_LIBBIN=${FOAM_LIBBIN}' >> /etc/environment && \
+    echo 'export FOAM_SRC=${FOAM_SRC}' >> /etc/environment && \
+    echo 'export WM_PROJECT_DIR=${WM_PROJECT_DIR}' >> /etc/environment"
+
+ENV FOAM_ETC=/usr/lib/openfoam/openfoam2506/etc
 RUN echo 'source /usr/lib/openfoam/openfoam2506/etc/bashrc' >> ~/.bashrc

dockerfiles/OF2506/arm64-deps/Dockerfile

@@ -28,5 +28,16 @@ make -j4 && make install && \
 cd / && rm -rf /tmp/muq2 && \
 conda clean -y --all
 ENV MUQ_LIBRARIES=/root/miniconda3
+
+# Export OpenFOAM environment variables for use in subsequent builds
+RUN /bin/bash -c "source /usr/lib/openfoam/openfoam2506/etc/bashrc && \
+    echo 'export FOAM_ETC=${FOAM_ETC}' >> /etc/environment && \
+    echo 'export FOAM_APP=${FOAM_APP}' >> /etc/environment && \
+    echo 'export FOAM_APPBIN=${FOAM_APPBIN}' >> /etc/environment && \
+    echo 'export FOAM_LIBBIN=${FOAM_LIBBIN}' >> /etc/environment && \
+    echo 'export FOAM_SRC=${FOAM_SRC}' >> /etc/environment && \
+    echo 'export WM_PROJECT_DIR=${WM_PROJECT_DIR}' >> /etc/environment"
+
+ENV FOAM_ETC=/usr/lib/openfoam/openfoam2506/etc
 RUN echo 'source /usr/lib/openfoam/openfoam2506/etc/bashrc' >> ~/.bashrc