New Docker Image & Docker CI

Author: henryleberre

.github/workflows/docker.yml

@@ -1,10 +1,10 @@
-name: Docker Image Publisher
+name: Docker Publisher
 
 on:
   push:
-    branches: [ "GPU" ]
+    branches: [ "master" ]
     paths:
-      - Dockerfile
+      - toolchain/Dockerfile
 
   workflow_dispatch:
 
@@ -16,14 +16,15 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Login to Docker Hub
-      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Build and push Docker image
-      uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+    - name: Build & Publish thereto
+      uses: docker/build-push-action@v4
       with:
         file: toolchain/Dockerfile
         push: true
-        tags: henryleberre/mfc:latest
+        tags: ${{ secrets.DOCKER_USERNAME }}/mfc:latest
+

mfc.sh

@@ -176,19 +176,27 @@ elif [ "$1" == "docker" ]; then
     fi
 
     log "Running in$MAGENTA Docker$COLOR_RESET mode."
-    log "  - Fetching image..."
-    if ! docker pull henryleberre/mfc; then
-        error "Failed to fetch$MAGENTA Docker$COLOR_RESET image from$MAGENTA Docker Hub$COLOR_RESET."
+
+    if [ -t 1 ]; then
+        dockerintopts='--interactive --tty'
+    fi
+
+    __docker_run() { 
+        docker run $dockerintopts --rm --workdir /home/me/MFC            \
+                   --mount type=bind,source="$(pwd)",target=/home/me/MFC \
+                   sbryngelson/mfc:latest $@
+    }
+
+    __docker_run sudo chown -R me:me /home/me/MFC
+    if (($?)); then
+        error "Docker: Failed to set directory permissions on MFC mount.."
 
         exit 1
     fi
 
-    log "  - Starting container..."
-    docker run --interactive --tty --rm                              \
-               --mount type=bind,source="$(pwd)",target=/home/me/MFC \
-               henryleberre/mfc
+    __docker_run $@
     if (($?)); then
-        error "Failed to start Docker container."
+        error "Error running Docker container with $@."
 
         exit 1
     fi

toolchain/Dockerfile

@@ -1,46 +1,24 @@
-FROM archlinux:latest
-
-# Install packages/dependencies
-RUN pacman-key --init
-RUN pacman -Syyu --noconfirm
-RUN pacman -S --noconfirm         \
-           base-devel coreutils   \
-           git ninja gcc-fortran  \
-           cmake openmpi python3  \
-           python-pip openssh     \
-           python-virtualenv vim  \
-           wget tree
-
-# Generic (non-root) user because MPI dislikes running as root.
-# This user is allowed to run "sudo" commands without a password.
-RUN     useradd --create-home --shell /bin/bash me
-RUN     passwd -d me
-RUN     echo "me ALL=(ALL:ALL) ALL" >> /etc/sudoers
-USER    me
-WORKDIR /home/me
-
-# Env
+FROM       ubuntu:jammy
+MAINTAINER Henry Le Berre <[email protected]>
+
 ENV PS1='[\u@mfc] \e[1;32m\w\e[0m \$ '
 ENV CMAKE_GENERATOR=Ninja
 
-# Bashrc
-RUN echo $' \
-export PS1="[\u@mfc] \e[1;32m\w\e[0m \$ " \n\
-echo " " \n\
-echo "        Welcome to the MFC Docker Environment!" \n\
-echo " " \n\
-if [ -d "/home/me/MFC" ]; then \n\
-    echo "  Please wait a few seconds while MFC configures directory permissions." \n\
-    echo "    > sudo chown -R me:me /home/me/MFC" \n\
-    sudo chown -R me:me /home/me/MFC \n\
-    echo "    > Complete." \n\
-    echo "  Follow the README\'s instructions to get started with MFC." \n\
-else \n\
-    echo "  Error: The MFC mount isn\'t available." \n\
-fi \n\
-echo "" \n\
-cd /home/me/MFC \n\
-' >> /home/me/.bashrc
-
-# Run bash as the default command
+RUN apt update && apt upgrade -y
+
+RUN apt install -y git tar wget make cmake ninja-build gcc g++  \
+                   python3 python3-dev python3-pip python3-venv \
+                   'openmpi-*' libopenmpi-dev sudo vim nano     \
+                   hdf5-tools
+
+RUN groupadd --gid 1000 me && \
+     useradd --uid 1000 --gid 1000 -m me
+
+RUN echo me ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/me && \
+    chmod 0440 /etc/sudoers.d/me
+
+USER me
+
+RUN pip3 install fypp rich pyyaml
+
 CMD ["/bin/bash"]