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

Simplify Dockerfile user management and build process

Author: blindmuraqib

dockerfiles/Dockerfile

@@ -5,8 +5,6 @@ FROM ithacafv/ithacafv-dependencies:${TARGETARCH} AS base
 
 LABEL maintainer="[email protected]"
 
-USER root
-
 # Install additional packages
 RUN apt-get update && \
     apt-get install -y \
@@ -18,62 +16,32 @@ RUN apt-get update && \
         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
+WORKDIR /usr/dir
+RUN git clone https://github.com/ITHACA-FV/ITHACA-FV.git
 
 # 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
 RUN echo $of_var >> /etc/bash.bashrc && \
     echo $ithaca_var >> /etc/bash.bashrc
 
-# Switch to ithacafv user
-USER $USER
+# Update bashrc with OpenFOAM and ITHACA-FV sources
+RUN echo $of_var >> /etc/bash.bashrc && \
+    echo $ithaca_var >> /etc/bash.bashrc
+
 
-# 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 && \
+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
-
-# Final setup
-USER $USER
-WORKDIR $HOME
 
 # Source bashrc on container start
 RUN /bin/bash -c "source /etc/bash.bashrc"
-
 ENTRYPOINT ["/bin/bash"]

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