Merge pull request ITHACA-FV#620 from ITHACA-FV/Docker

ENH: consolidate Docker build architecture and update workflow

Author: blindmuraqib

.github/workflows/docker-publish.yml

@@ -44,7 +44,8 @@ jobs:
       id: build
       uses: docker/build-push-action@v5
       with:
-        context: ./dockerfiles/OF2412
+        context: ./dockerfiles
+        file: ./dockerfiles/Dockerfile
         platforms: linux/amd64
         labels: ${{ steps.meta.outputs.labels }}
         cache-from: type=gha
@@ -85,7 +86,8 @@ jobs:
       id: build
       uses: docker/build-push-action@v5
       with:
-        context: ./dockerfiles/OF2412
+        context: ./dockerfiles
+        file: ./dockerfiles/Dockerfile
         platforms: linux/arm64
         labels: ${{ steps.meta.outputs.labels }}
         cache-from: type=gha

.github/workflows/docker_ithaca.yml

@@ -0,0 +1,79 @@
+# Multi-architecture Dockerfile for ITHACA-FV
+# Automatically selects the correct base image based on target platform
+ARG TARGETARCH
+FROM ghcr.io/ithaca-fv/ithacafv-dependencies:${TARGETARCH} AS base
+
+LABEL maintainer="[email protected]"
+
+USER root
+
+# Install additional packages
+RUN apt-get update && \
+    apt-get install -y \
+        git \
+        vim \
+        ssh \
+        sudo \
+        wget \
+        software-properties-common && \
+    rm -rf /var/lib/apt/lists/*
+
+# Create ithacafv user and group
+ARG USER=ithacafv
+RUN if id -u 1000 >/dev/null 2>&1; then \
+        userdel $(id -nu 1000) || true; \
+    fi && \
+    if getent group 1000 >/dev/null 2>&1; then \
+        groupdel $(getent group 1000 | cut -d: -f1) || true; \
+    fi && \
+    adduser --disabled-password --gecos '' --uid 1000 $USER && \
+    adduser $USER sudo && \
+    echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+# Set environment variables
+ENV HOME=/home/$USER
+ENV USER=$USER
+
+# Set working directory and clone ITHACA-FV
+WORKDIR /opt
+RUN git clone https://github.com/mathLab/ITHACA-FV.git && \
+    chown -R $USER:$USER ITHACA-FV && \
+    chown -R $USER:$USER /home/$USER
+
+# Environment variables for bashrc
+ARG of_var="source /usr/lib/openfoam/openfoam2412/etc/bashrc"
+ARG ithaca_var="source /opt/ITHACA-FV/etc/bashrc"
+
+# Update bashrc with OpenFOAM and ITHACA-FV sources
+RUN echo $of_var >> /etc/bash.bashrc && \
+    echo $ithaca_var >> /etc/bash.bashrc
+
+# Switch to ithacafv user
+USER $USER
+
+# Build ITHACA-FV with architecture-specific flags
+RUN /bin/bash -c "source /usr/lib/openfoam/openfoam2412/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; \
+    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
+
+# Final setup
+USER $USER
+WORKDIR $HOME
+
+# Source bashrc on container start
+RUN /bin/bash -c "source /etc/bash.bashrc"
+
+ENTRYPOINT ["/bin/bash"]

dockerfiles/Dockerfile

@@ -18,9 +18,6 @@ bash Miniconda3-latest-Linux-aarch64.sh -b && \
 rm Miniconda3-latest-Linux-aarch64.sh && \
 . /root/miniconda3/etc/profile.d/conda.sh && \  
 export PATH=/root/miniconda3/bin:$PATH && \
-wget https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.7.1%2Bcpu.zip && \
-unzip libtorch-cxx11-abi-shared-with-deps-2.7.1+cpu.zip && \
-rm libtorch-cxx11-abi-shared-with-deps-2.7.1+cpu.zip && \
 conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main && \
 conda tos accept --override-channels --channel  https://repo.anaconda.com/pkgs/r && \
 conda install -y -c conda-forge cmake pybind11 eigen hdf5 nlopt && \
@@ -30,7 +27,6 @@ cmake -DCMAKE_INSTALL_PREFIX=/root/miniconda3 -DMUQ_USE_PYTHON=ON .. && \
 make -j4 && make install && \
 cd / && rm -rf /tmp/muq2 && \
 conda clean -y --all
-ENV TORCH_LIBRARIES=/libtorch
 ENV MUQ_LIBRARIES=/root/miniconda3
 RUN echo 'source /usr/lib/openfoam/openfoam2412/etc/bashrc' >> ~/.bashrc 
 

dockerfiles/OF2412/arm64-deps/Dockerfile

@@ -27,4 +27,4 @@ conda install -y -c conda-forge muq cmake pybind11 && \
 conda clean -y --all
 ENV TORCH_LIBRARIES=/libtorch
 ENV MUQ_LIBRARIES=/root/miniconda3
-RUN echo 'source /usr/lib/openfoam/openfoam2412/etc/bashrc' >> ~/.bashrc
+RUN echo 'source /usr/lib/openfoam/openfoam2506/etc/bashrc' >> ~/.bashrc

dockerfiles/OF2506/amd64-deps/Dockerfile

@@ -18,9 +18,6 @@ bash Miniconda3-latest-Linux-aarch64.sh -b && \
 rm Miniconda3-latest-Linux-aarch64.sh && \
 . /root/miniconda3/etc/profile.d/conda.sh && \
 export PATH=/root/miniconda3/bin:$PATH && \
-wget https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.7.1%2Bcpu.zip && \
-unzip libtorch-cxx11-abi-shared-with-deps-2.7.1+cpu.zip && \
-rm libtorch-cxx11-abi-shared-with-deps-2.7.1+cpu.zip && \
 conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main && \
 conda tos accept --override-channels --channel  https://repo.anaconda.com/pkgs/r && \
 conda install -y -c conda-forge cmake pybind11 eigen hdf5 nlopt && \
@@ -30,7 +27,6 @@ cmake -DCMAKE_INSTALL_PREFIX=/root/miniconda3 -DMUQ_USE_PYTHON=ON .. && \
 make -j4 && make install && \
 cd / && rm -rf /tmp/muq2 && \
 conda clean -y --all
-ENV TORCH_LIBRARIES=/libtorch
 ENV MUQ_LIBRARIES=/root/miniconda3
-RUN echo 'source /usr/lib/openfoam/openfoam2412/etc/bashrc' >> ~/.bashrc
+RUN echo 'source /usr/lib/openfoam/openfoam2506/etc/bashrc' >> ~/.bashrc