Update docker workflow

Author: IngeborgGjerde

.github/workflows/docker-image-old.yml

@@ -0,0 +1,36 @@
+name: Docker image
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          logout: true
+      
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ingeborggjerde/graphnics
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: latest
+

.github/workflows/docker-image.yml

@@ -1,36 +1,57 @@
-name: Docker image
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Create and publish a Docker image
 
 on:
   push:
     branches:
-      - 'main'
+      - "!*"
+    tags:
+      - "v*"
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
+  build-and-push-image:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
     steps:
-      - name: Check out the repo
+      - name: Checkout repository
         uses: actions/checkout@v3
-      
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          logout: true
-      
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@v4
         with:
-          images: ingeborggjerde/graphnics
-      
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
       - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
-          labels: latest
-
+          labels: ${{ steps.meta.outputs.labels }}
+          file: docker/Dockerfile

Dockerfile

@@ -1,43 +1,19 @@
-# Builds a Docker image containing the mixed-dimensional features of FEniCS
-# found in
-#   - fenics_mixed_dimensional 
-#   - fenics_ii 
+# Use github pages for docker image
+FROM ghcr.io/ingeborggjerde/graphnics:v0.1.0
 
-FROM ceciledc/fenics_mixed_dimensional:21-06-22
+# Create user with a home directory
+ARG NB_USER
+ARG NB_UID=1000
+ENV USER ${NB_USER}
+ENV HOME /home/${NB_USER}
 
-USER root
-
-RUN apt-get -qq update && \
-    apt-get clean && \
-    apt-get -y install python3-h5py && \
-    pip install --upgrade pip && \
-    pip install networkx && \
-    pip install pandas && \
-    pip install tqdm && \
-    pip install jupyter && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*- && \
-    pip install -U setuptools
-    
-# Get fenics_ii
-RUN git clone https://github.com/MiroK/fenics_ii.git && \
-    cd fenics_ii && \
-    python3 setup.py install && \
-    cd ..
-
-
-# cbc.block
-RUN git clone https://bitbucket.org/fenics-apps/cbc.block && \
-    cd cbc.block && \
-    python3 setup.py install && \
-    cd ..
-
-# Get graphnics
-RUN git clone https://github.com/IngeborgGjerde/graphnics.git && \
-    cd graphnics && \
-    python3 setup.py install && \
-    cd ..
-
-# fix decorator error by reinstalling scipy
-RUN pip uninstall -y scipy && pip install scipy
+# Copy current directory
+WORKDIR ${HOME}
+COPY . ${HOME}
 
+# Change ownership of home directory
+USER root
+RUN chown -R ${NB_UID} ${HOME}
 
+USER ${NB_USER}
+ENTRYPOINT []

docker/Dockerfile

@@ -0,0 +1,53 @@
+# Builds a Docker image containing the mixed-dimensional features of FEniCS
+# found in
+#   - fenics_mixed_dimensional 
+#   - fenics_ii 
+
+FROM ceciledc/fenics_mixed_dimensional:21-06-22
+
+USER root
+
+RUN apt-get -y install python3-h5py && \
+    pip install --upgrade pip && \
+    pip install networkx && \
+    pip install pandas && \
+    pip install tqdm && \
+    pip install --no-cache-dir notebook jupyterlab jupyterhub && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*- && \
+    pip install -U setuptools
+
+# Get fenics_ii
+RUN git clone https://github.com/MiroK/fenics_ii.git && \
+    cd fenics_ii && \
+    python3 -m pip install -e . && \
+    cd ..
+
+
+# cbc.block
+RUN git clone https://bitbucket.org/fenics-apps/cbc.block && \
+    cd cbc.block && \
+    python3 -m pip install . && \
+    cd ..
+    
+    
+# fix decorator error by reinstalling scipy
+RUN pip uninstall -y scipy && pip install scipy
+
+
+# Create user with a home directory
+ARG NB_USER
+ARG NB_UID=1000
+ENV USER ${NB_USER}
+ENV HOME /home/${NB_USER}
+
+RUN echo $NB_USER
+   
+# Copy home directory for usage with Binder
+WORKDIR ${HOME}
+COPY . ${HOME}
+USER root
+RUN chown -R ${NB_UID} ${HOME}
+
+USER ${NB_USER}
+#ENTRYPOINT []
+