devcontainer & workflow updates

Author: Malmahrouqi3

.devcontainer/devcontainer.json

@@ -0,0 +1,9 @@
+{
+  "name": "MFC Container",
+  "image": "sbryngelson/mfc:latest-cpu",
+  "workspaceFolder": "/opt/MFC",
+  "settings": {
+    "terminal.integrated.shell.linux": "/bin/bash",
+    "editor.formatOnSave": true
+  },
+}

.github/.dockerignore

@@ -4,7 +4,6 @@ yarn.lock
 
 .venv/
 .vscode/
-src/*/include/case.fpp
 src/*/autogen/
 
 *.swo

.github/Dockerfile

@@ -14,12 +14,12 @@ RUN apt-get update -y && \
             build-essential git make cmake gcc g++ gfortran \
             python3 python3-venv python3-pip \
             openmpi-bin libopenmpi-dev libfftw3-dev \
-            libatlas-base-dev mpich libmpich-dev; \
+            mpich libmpich-dev; \
     else \
         apt-get install -y \
             build-essential git make cmake \
             python3 python3-venv python3-pip \
-            libfftw3-dev libatlas-base-dev \
+            libfftw3-dev \
             openmpi-bin libopenmpi-dev; \
     fi && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -52,4 +52,4 @@ RUN cd /opt/MFC && \
     fi
 
 WORKDIR /opt/MFC
-ENTRYPOINT ["bash"]
+ENTRYPOINT ["tail", "-f", "/dev/null"]

.github/workflows/docker.yml

@@ -4,51 +4,61 @@ on:
   release:
     types: [published]
   workflow_dispatch:
+    inputs:
+      tag:
+        description: 'tag to containerize'
+        required: true
+
+concurrency:
+  group: Containerization-${{ github.event.inputs.tag || github.ref_name }}
+  cancel-in-progress: false
 
 jobs:
   Container:
-    runs-on: ubuntu-latest
     strategy:
       matrix:
         config:
-          - { name: 'cpu',         base_image: 'ubuntu:22.04'}
-          - { name: 'gpu',         base_image: 'nvcr.io/nvidia/nvhpc:23.11-devel-cuda12.3-ubuntu22.04'}
-
+            - { name: 'cpu', runner: 'ubuntu-22.04',     base_image: 'ubuntu:22.04' }
+            - { name: 'cpu', runner: 'ubuntu-22.04-arm', base_image: 'ubuntu:22.04' }
+            - { name: 'gpu', runner: 'ubuntu-22.04',     base_image: 'nvcr.io/nvidia/nvhpc:23.11-devel-cuda12.3-ubuntu22.04' }
+            - { name: 'gpu', runner: 'ubuntu-22.04-arm', base_image: 'nvcr.io/nvidia/nvhpc:23.11-devel-cuda12.3-ubuntu22.04' }
+    runs-on: ${{ matrix.config.runner }}
     steps:
-      - name: Clone
-        uses: actions/checkout@v4
-        with:
-          path: mfc
-
       - name: Login
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-      - name: Setup
+      - name: Setup Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Stage
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Clone
         run: |
           if [ -n "${{ github.event.inputs.tag }}" ]; then
             echo "TAG=${{ github.event.inputs.tag }}" >> $GITHUB_ENV
           elif [[ "${{ github.ref }}" == refs/tags/* ]]; then
             echo "TAG=${{ github.ref_name }}" >> $GITHUB_ENV
           fi
 
+          git clone --branch ${{ env.TAG }} --depth 1 https://github.com/MFlowCode/MFC.git mfc
+
+      - name: Stage
+        run: |
           sudo mkdir -p /mnt/share
           sudo chmod 777 /mnt/share
           cp -r mfc/* /mnt/share/
           cp -r mfc/.git /mnt/share/.git
           cp mfc/.github/Dockerfile /mnt/share/
           cp mfc/.github/.dockerignore /mnt/share/
-          docker buildx create --name mfcbuilder --driver docker-container --use
 
       - name: Build and Deploy
         uses: docker/build-push-action@v5
         with:
-          builder: mfcbuilder
+          builder: default
           context: /mnt/share
           file: /mnt/share/Dockerfile
           build-args: |
@@ -59,7 +69,37 @@ jobs:
             FC_COMPILER=${{ contains(matrix.config.name, 'gpu') && 'nvfortran' || 'gfortran' }}
             COMPILER_PATH=${{ contains(matrix.config.name, 'gpu') && '/opt/nvidia/hpc_sdk/Linux_x86_64/compilers/bin' || '/usr/bin' }}
             COMPILER_LD_LIBRARY_PATH=${{ contains(matrix.config.name, 'gpu') && '/opt/nvidia/hpc_sdk/Linux_x86_64/compilers/lib' || '/usr/lib' }}
-          tags: sbryngelson/mfc:${{ env.TAG }}-${{ matrix.config.name }}
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-${{ matrix.config.name }}-${{ matrix.config.runner}}
           push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+
+  manifests:
+    runs-on: ubuntu-latest
+    needs: Container
+    steps:
+      - name: Login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Create and Push Manifest Lists
+        run: |
+          docker manifest create ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-cpu \
+            ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-cpu-ubuntu-22.04 \
+            ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-cpu-ubuntu-22.04-arm
+          docker manifest push ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-cpu
+
+          docker manifest create ${{ secrets.DOCKERHUB_USERNAME }}/mfc:latest-cpu \
+            ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-cpu-ubuntu-22.04 \
+            ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-cpu-ubuntu-22.04-arm
+          docker manifest push ${{ secrets.DOCKERHUB_USERNAME }}/mfc:latest-cpu
+
+          docker manifest create ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-gpu \
+            ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-gpu-ubuntu-22.04 \
+            ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-gpu-ubuntu-22.04-arm
+          docker manifest push ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-gpu
+
+          docker manifest create ${{ secrets.DOCKERHUB_USERNAME }}/mfc:latest-gpu \
+            ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-gpu-ubuntu-22.04 \
+            ${{ secrets.DOCKERHUB_USERNAME }}/mfc:${{ env.TAG }}-gpu-ubuntu-22.04-arm
+          docker manifest push ${{ secrets.DOCKERHUB_USERNAME }}/mfc:latest-gpu