From 5e91f7ad05e81b0ee4f5481b193bcc26141abc53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20S=2E=20Dokken?= <dokken@simula.no>
Date: Mon, 14 Oct 2024 17:09:49 +0200
Subject: [PATCH] Update for release

---
 .github/workflows/publish_docker.yml | 4 +---
 Dockerfile                           | 2 +-
 docker/Dockerfile                    | 8 ++++----
 pyproject.toml                       | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/publish_docker.yml b/.github/workflows/publish_docker.yml
index 529658d1..77ffc5f3 100644
--- a/.github/workflows/publish_docker.yml
+++ b/.github/workflows/publish_docker.yml
@@ -54,12 +54,10 @@ jobs:
           platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-  
-
 
       - name: Build (arm) and push (amd/arm) Docker image
         uses: docker/build-push-action@v5
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+        if: github.event_name == 'push'
         with:
           context: .
           push: true
diff --git a/Dockerfile b/Dockerfile
index 4de36870..d84fa39b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/jorgensd/dolfinx-tutorial:v0.7.2
+FROM ghcr.io/jorgensd/dolfinx-tutorial:release
 
 # create user with a home directory
 ARG NB_USER=jovyan
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6698fbb1..94bc0324 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Execute from root of repo as: docker buildx build --platform=linux/arm64,linux/amd64 -f docker/Dockerfile ./docker/ --progress=plain
 
-FROM ghcr.io/fenics/dolfinx/lab:v0.8.0
+FROM ghcr.io/fenics/dolfinx/lab:v0.9.0
 ARG TARGETPLATFORM
 
 
@@ -11,7 +11,7 @@ ENV PYVISTA_JUPYTER_BACKEND="static"
 
 WORKDIR /tmp/
 # Requirements for pyvista (gl1 and render1) and jupyterlab (nodejs and curl)
-RUN apt-get update && apt-get install -y libgl1-mesa-glx libxrender1 xvfb curl
+RUN apt-get update && apt-get install -y libgl1-mesa-dev libxrender1 xvfb curl
 RUN curl -sL https://deb.nodesource.com/setup_18.x -o nodesource_setup.sh && \
     bash nodesource_setup.sh && \
     apt install nodejs
@@ -27,11 +27,11 @@ RUN python3 -m pip install -U setuptools pip pkgconfig
 #     python3 setup.py bdist_wheela
 
 RUN echo ${TARGETPLATFORM}
-RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then python3 -m pip install "https://github.com/finsberg/vtk-aarch64/releases/download/vtk-9.2.6-cp310/vtk-9.2.6.dev0-cp310-cp310-linux_aarch64.whl"; fi
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then python3 -m pip install "https://github.com/finsberg/vtk-aarch64/releases/download/vtk-9.3.0-cp312/vtk-9.3.0.dev0-cp312-cp312-linux_aarch64.whl"; fi
 RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then python3 -m pip install vtk; fi
 
 ADD pyproject.toml /tmp/pyproject.toml
 RUN python3 -m pip install --no-cache-dir --no-binary=h5py -v .
 RUN python3 -m pip cache purge
-RUN jupyter lab build
+
 ENTRYPOINT ["jupyter", "lab", "--ip", "0.0.0.0", "--no-browser", "--allow-root"]
diff --git a/pyproject.toml b/pyproject.toml
index 649c3911..2ff9e6d4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "DOLFINx_Tutorial"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
     "jupyter-book",
     "meshio",
@@ -13,7 +13,7 @@ dependencies = [
     "pandas",
     "tqdm",
     "pyvista[all]>=0.43.0",
-    "fenics-dolfinx>=0.8.0",
+    "fenics-dolfinx>=0.9.0",
 ]
 
 [project.optional-dependencies]