Remove firedrake-env image (#4138)

* Remove firedrake-env image

It only contained a trivial amount of setup code (now moved to
firedrake-vanilla) and had the potential to trip up CI if it needed to
be rebuilt.

Author: connorjward

.github/workflows/build.yml

@@ -30,10 +30,12 @@ jobs:
         arch: [default, complex]
     runs-on: [self-hosted, Linux]
     container:
-      image: firedrakeproject/firedrake-env:latest
+      image: ubuntu:latest
     env:
       OMPI_ALLOW_RUN_AS_ROOT: 1
       OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
+      OMP_NUM_THREADS: 1
+      OPENBLAS_NUM_THREADS: 1
       FIREDRAKE_CI: 1
       PYOP2_CI_TESTS: 1
       PYOP2_SPMD_STRICT: 1
@@ -56,8 +58,9 @@ jobs:
       - name: Install system dependencies
         run: |
           apt-get update
+          apt-get -y install python3
           apt-get -y install \
-            $(python3 ./firedrake-repo/scripts/firedrake-configure --arch ${{ matrix.arch }} --show-system-packages)
+            $(python3 ./firedrake-repo/scripts/firedrake-configure --arch ${{ matrix.arch }} --show-system-packages) python3-venv parallel
 
       - name: Install PETSc
         run: |
@@ -220,10 +223,8 @@ jobs:
       tag: ${{ env.RELEASE_TAG }}
 
   docker:
-    name: "Build Docker containers"
-    # Only run on master, but always generate firedrake-env image,
-    # even if build fails (see docker.yml)
-    if: always() && (github.ref == 'refs/heads/master')
+    name: Build Docker containers
+    if: github.ref == 'refs/heads/master'
     needs: [test, docker_tag]
     uses: ./.github/workflows/docker.yml
     with:

.github/workflows/docker.yml

@@ -20,39 +20,10 @@ on:
         required: true
 
 jobs:
-  # Firedrake environment container
-  docker_build_env:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [Linux, macOS]
-        include:
-          - os: Linux
-            platform: linux/amd64
-          - os: macOS
-            platform: linux/arm64
-    uses: ./.github/workflows/docker_build.yml
-    with:
-      os: ${{ matrix.os }}
-      platform: ${{ matrix.platform }}
-      target: firedrake-env
-      tag: ${{ inputs.tag }}
-      dockerfile: docker/Dockerfile.env
-    secrets: inherit
-
-  docker_merge_env:
-    uses: ./.github/workflows/docker_merge.yml
-    needs: docker_build_env
-    with:
-      target: firedrake-env
-      tag: ${{ inputs.tag }}
-    secrets: inherit
-
   # Firedrake container (just Firedrake)
   docker_build_vanilla:
     # Only run if Firedrake tests pass
     if: inputs.status == 'success'
-    needs: docker_merge_env
     strategy:
       fail-fast: false
       matrix:

docker/Dockerfile.env

@@ -1,12 +1,29 @@
 # Dockerfile for a plain Firedrake suitable for testing Firedrake components and applications
 
-FROM firedrakeproject/firedrake-env:latest
+FROM ubuntu:latest
+
+# Firedrake arch to build
+ARG ARCH="default"
 
 # Set '-o pipefail' to avoid linter error (https://github.com/hadolint/hadolint/wiki/DL4006)
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-# Firedrake arch to build
-ARG ARCH="default"
+# Use a more sane locale
+ENV LC_ALL=C.UTF-8
+
+# Avoid tzdata prompt
+# (https://stackoverflow.com/questions/61388002/how-to-avoid-question-during-the-docker-build)
+ENV DEBIAN_FRONTEND=noninteractive
+ENV TZ=Europe/London
+
+# Install 'parallel' because it is needed by 'firedrake-run-split-tests'
+RUN apt-get update \
+    && apt-get -y install curl parallel python3 python3-pip python3-venv sudo \
+    && rm -rf /var/lib/apt/lists/*
+
+# Allow pip to install into system package locations without prompting
+ENV PIP_BREAK_SYSTEM_PACKAGES=1
+ENV OMP_NUM_THREADS=1 OPENBLAS_NUM_THREADS=1
 
 # Download firedrake-configure
 RUN curl -O --output-dir /opt https://raw.githubusercontent.com/firedrakeproject/firedrake/master/scripts/firedrake-configure