From a36bdf539d1465aac9c002a9b1fbee50f128ebcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Dokken?= <dokken92@gmail.com>
Date: Tue, 24 May 2022 21:01:23 +0100
Subject: [PATCH] bump version to 0.4.1

---
 .github/workflows/build-publish.yml |  4 +--
 .github/workflows/docker-image.yml  | 40 -----------------------------
 Dockerfile                          |  2 +-
 docker/Dockerfile                   |  4 +--
 docker/requirements.txt             |  4 +++
 fem.md                              |  4 +--
 6 files changed, 11 insertions(+), 47 deletions(-)
 delete mode 100644 .github/workflows/docker-image.yml

diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml
index 37a8cba8..dcad088f 100644
--- a/.github/workflows/build-publish.yml
+++ b/.github/workflows/build-publish.yml
@@ -20,12 +20,12 @@ jobs:
   build:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-    container: dokken92/dolfinx_custom:02052022
+    container: dokken92/dolfinx_custom:v0.4.1
 
     env:
       HDF5_MPI: "ON"
       CC: mpicc
-      HDF5_DIR: "/usr/lib/x86_64-linux-gnu/hdf5/mpich/"
+      HDF5_DIR: "/usr/local/"
       DISPLAY: ":99.0"
       PYVISTA_OFF_SCREEN: true
 
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
deleted file mode 100644
index 3a6dee3f..00000000
--- a/.github/workflows/docker-image.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# name: Docker tutorial images
-
-# # Builds images with DOLFINx and all of the required FEniCS Project
-# # components nightly.
-
-on:
-  # Uncomment the below to trigger 'docker build' on push
-  # push:
-  #    branches:
-  #      - "dokken/jupyterbook"
-  # schedule:
-  #   # '*' is a special character in YAML, so string must be quoted
-  #   - cron: "0 6 * * *"
-  workflow_dispatch: ~
-
-jobs:
-  build_end_user_images:
-    name: Build DOLFINx tutorial images for binder
-    if: ${{ github.repository == 'jorgensd/dolfinx-tutorial' && github.ref == 'refs/heads/dokken/jupyterbook' }}
-    runs-on: ubuntu-20.04
-    env:
-      HDF5_MPI: "ON"
-      CC: "mpicc"
-      HDF5_DIR: "/usr/lib/x86_64-linux-gnu/hdf5/mpich/"
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          repository: "jorgensd/dolfinx-tutorial"
-          path: "tutorial"
-      - name: Pull dolfinx/dolfinx
-        run: |
-          docker pull dolfinx/dolfinx
-      - name: Build the Docker images
-        run: |
-          docker build --file tutorial/docker/Dockerfile --cache-from dolfinx/dolfinx --tag dokken92/dolfinx_custom:10042021 .
-      - name: Log into the DockerHub registry
-        run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-      - name: Push to the DockerHub registry
-        run: |
-          docker push dokken92/dolfinx_custom:02052022
diff --git a/Dockerfile b/Dockerfile
index 20f4aa8f..84eabb68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM dokken92/dolfinx_custom:02052022
+FROM dokken92/dolfinx_custom:v0.4.1
 
 # create user with a home directory
 ARG NB_USER
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f15ce236..42289c25 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,11 +1,11 @@
-FROM dolfinx/lab:v0.4.0
+FROM dolfinx/lab:v0.4.1
 
 WORKDIR /tmp/
 
 ADD requirements.txt /tmp/requirements.txt
 
 # Install dependencies
-RUN HDF5_MPI="ON" HDF5_DIR="/usr/lib/x86_64-linux-gnu/hdf5/mpich/" CC=mpicc pip3 install --no-cache-dir -r requirements.txt
+RUN HDF5_MPI="ON" HDF5_DIR="/usr/local/" CC=mpicc pip3 install --no-cache-dir -r requirements.txt
 
 # Activate plotting
 RUN jupyter nbextension enable --py --sys-prefix ipygany
diff --git a/docker/requirements.txt b/docker/requirements.txt
index f3f29e55..93bf6c22 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -18,7 +18,11 @@ pandas
 
 # Visualization with Pyvista 
 matplotlib
+
+# Until VTK is released with wheels for python 3.10
+--find-links https://wheels.pyvista.org/
 pyvista
+
 pythreejs
 ipygany
 
diff --git a/fem.md b/fem.md
index 16bdc7b6..030dc6e9 100644
--- a/fem.md
+++ b/fem.md
@@ -33,11 +33,11 @@ Docker is a software that uses *containers* to supply software across different
 All notebooks can be converted to python files using [nbconvert](https://nbconvert.readthedocs.io/en/latest/).
 
 ### Tutorial compatible docker images
-The tutorial uses several dependencies for meshing, plotting and timings. A compatible `JupyterLab` image is available at [DockerHub/dokken92/dolfinx_custom:labv0.4.0](https://hub.docker.com/r/dokken92/dolfinx_custom/tags)
+The tutorial uses several dependencies for meshing, plotting and timings. A compatible `JupyterLab` image is available at [DockerHub/dokken92/dolfinx_custom:v0.4.1](https://hub.docker.com/r/dokken92/dolfinx_custom/tags)
 
 To use the notebookes in this tutorial with DOLFINx on your own computer, you should use the docker image using the following command
 ```
-  docker run --init -p 8888:8888 -v "$(pwd)":/root/shared dokken92/dolfinx_custom:labv0.4.0
+  docker run --init -p 8888:8888 -v "$(pwd)":/root/shared dokken92/dolfinx_custom:v0.4.1
 ```
 The tutorials can also be exported as a notebook or PDF by clicking the ![Download](save.png)-symbol in the top right corner of the relevant tutorialThe notebook can in turn be used with a Python kernel which has DOLFINx.