Apply suggestions from code review

.github/workflows/build.yml

@@ -209,11 +209,10 @@ jobs:
     name: "Build Docker containers"
     # Only run on master, but always generate firedrake-env image,
     # even if build fails (see docker.yml)
-    # if: ${{ (github.ref == 'refs/heads/master') && always() }}
-    if: ${{ always() }}
-    # needs: [test, docker_tag]
+    if: ${{ (github.ref == 'refs/heads/master') && always() }}
+    needs: [test, docker_tag]
     uses: ./.github/workflows/docker.yml
     with:
-      tag: testing
-      status: success
+      tag: ${{ needs.docker_tag.outputs.tag }}
+      status: ${{ needs.test.result }}
     secrets: inherit

.github/workflows/docker.yml

@@ -50,7 +50,7 @@ jobs:
   # Firedrake container (just Firedrake)
   docker_build_vanilla:
     # Only run if "Build Firedrake" succeeds
-    # if: ${{ inputs.status == 'success' }}
+    if: ${{ inputs.status == 'success' }}
     needs: docker_merge_env
     strategy:
       matrix:
@@ -61,6 +61,7 @@ jobs:
             extra-install-flags: ""
           - os: macOS
             platform: linux/arm64
+            # VTK does not have Linux ARM wheels (https://gitlab.kitware.com/vtk/vtk/-/issues/18772)
             extra-install-flags: "--no-vtk"
     uses: ./.github/workflows/docker_build.yml
     with:
@@ -116,7 +117,7 @@ jobs:
   # # Firedrake container (Firedrake and friends)
   docker_build_firedrake:
     # Only run if "Build Firedrake" succeeds
-    # if: ${{ inputs.status == 'success' }}
+    if: ${{ inputs.status == 'success' }}
     needs: docker_merge_vanilla
     strategy:
       matrix:
@@ -149,7 +150,7 @@ jobs:
   # # Firedrake container with documentation dependencies and TeX
   docker_build_docdeps:
     # Only run if "Build Firedrake" succeeds
-    # if: ${{ inputs.status == 'success' }}
+    if: ${{ inputs.status == 'success' }}
     needs: docker_merge_vanilla
     strategy:
       matrix:
@@ -179,7 +180,7 @@ jobs:
   # # Firedrake container with Jupyter notebooks
   docker_build_jupyter:
     # Only run if "Build Firedrake" succeeds
-    # if: ${{ inputs.status == 'success' }}
+    if: ${{ inputs.status == 'success' }}
     needs: docker_merge_firedrake
     strategy:
       matrix:

.github/workflows/docker_merge.yml

@@ -1,8 +1,7 @@
 name: Reusable Docker workflow
 
-# This workflow creates both Linux and macOS images and then merges and pushes them
-# in a separate step. See https://docs.docker.com/build/ci/github-actions/multi-platform/
-# for more information.
+# This workflow merges Linux and macOS images and pushes them to Docker.
+# See https://docs.docker.com/build/ci/github-actions/multi-platform/ for more information.
 
 on:
   workflow_call:

docker/Dockerfile.complex

@@ -1,6 +1,6 @@
 # DockerFile for Firedrake in complex mode with a full set of capabilities.
 
-FROM firedrakeproject/firedrake-env:testing
+FROM firedrakeproject/firedrake-env:latest
 
 USER firedrake
 WORKDIR /home/firedrake

docker/Dockerfile.docdeps

@@ -1,6 +1,6 @@
 # DockerFile for Firedrake with a full set of capabilities and applications installed.
 
-FROM firedrakeproject/firedrake-vanilla:testing
+FROM firedrakeproject/firedrake-vanilla:latest
 
 USER root
 WORKDIR /home/firedrake

docker/Dockerfile.firedrake

@@ -1,6 +1,6 @@
 # DockerFile for Firedrake with a full set of capabilities and applications installed.
 
-FROM firedrakeproject/firedrake-vanilla:testing
+FROM firedrakeproject/firedrake-vanilla:latest
 
 USER firedrake
 WORKDIR /home/firedrake

docker/Dockerfile.jupyter

@@ -1,6 +1,6 @@
 # DockerFile for a firedrake + jupyter container
 
-FROM firedrakeproject/firedrake:testing
+FROM firedrakeproject/firedrake:latest
 
 USER firedrake
 WORKDIR /home/firedrake

docker/Dockerfile.vanilla

@@ -1,6 +1,6 @@
 # DockerFile for a plain Firedrake suitable for testing Firedrake components and applications
 
-FROM firedrakeproject/firedrake-env:testing
+FROM firedrakeproject/firedrake-env:latest
 
 USER firedrake
 WORKDIR /home/firedrake