Add dolfinx dependencies in user docker image as requirement and run end-user Docker image build in CI (#3697)

* Add required cmake flags for C++ Dolfinx dependencies

* Add non publishing CI for end user Docker image

* Switch to env variable

* Other access pattern

* Again

* Move to steps

Author: schnellerhase

.github/workflows/docker-end-user.yml

@@ -10,6 +10,17 @@ on:
   schedule:
     # '*' is a special character in YAML, so string must be quoted
     - cron: "0 1 * * *"
+  push:
+    branches:
+      - "**"
+    tags:
+      - "v*"
+  pull_request:
+    branches:
+      - main
+  merge_group:
+    branches:
+      - main
   workflow_dispatch:
     inputs:
       tag_prefix:
@@ -54,6 +65,9 @@ on:
         type: string
         required: true
 
+env:
+  publish: ${{ github.repository == 'FEniCS/dolfinx' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) }}
+
 jobs:
   create_end_user_images:
     name: Build DOLFINx end-user images
@@ -100,18 +114,21 @@ jobs:
           repository: "FEniCS/basix"
           path: "basix"
           ref: ${{ env.BASIX_REF }}
+
       - name: Checkout UFL
         uses: actions/checkout@v4
         with:
           repository: "FEniCS/ufl"
           path: "ufl"
           ref: ${{ env.UFL_REF }}
+
       - name: Checkout FFCx
         uses: actions/checkout@v4
         with:
           repository: "FEniCS/ffcx"
           path: "ffcx"
           ref: ${{ env.FFCX_REF }}
+
       - name: Checkout DOLFINx
         uses: actions/checkout@v4
         with:
@@ -122,6 +139,7 @@ jobs:
       - name: Set default FFCx options
         run: |
           echo '{ }' > dolfinx/docker/ffcx_options.json
+
       - name: Set default DOLFINx JIT options
         run: |
           echo '{ "cffi_extra_compile_args" : ["-O2"] } ' > dolfinx/docker/dolfinx_jit_options.json
@@ -182,17 +200,21 @@ jobs:
               /bin/bash -c "source /usr/local/bin/dolfinx-complex-mode && python3 -c $'import dolfinx; from dolfinx.fem import functionspace; from dolfinx.mesh import create_unit_square; from mpi4py import MPI; mesh = create_unit_square(MPI.COMM_WORLD, 10, 10); V = functionspace(mesh, (\"Lagrange\", 1));'"
 
       - name: Login to Docker Hub
+        if: ${{ env.publish == 'true' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Push to the DockerHub registry
+        if: ${{ env.publish == 'true' }}
         run: |
           docker push docker.io/dolfinx/dolfinx-onbuild:${{ env.TAG }}
           docker push docker.io/dolfinx/dolfinx:${{ env.TAG }}
           docker push docker.io/dolfinx/lab:${{ env.TAG }}
 
       - name: Cleanup
+        if: ${{ env.publish == 'true' }}
         run: |
           docker rmi docker.io/dolfinx/lab:${{ env.TAG }}
           docker rmi docker.io/dolfinx/dolfinx:${{ env.TAG }}
@@ -212,19 +234,22 @@ jobs:
           echo "TAG=${USER_INPUT:-nightly}" >> $GITHUB_ENV
 
       - name: Login to Docker Hub
+        if: ${{ env.publish == 'true' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
+        if: ${{ env.publish == 'true' }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Push multiarch images to ghcr.io and docker.io
+        if: ${{ env.publish == 'true' }}
         run: |
           GH_PREFIX="ghcr.io/fenics/dolfinx"
           DH_PREFIX="docker.io/dolfinx"

docker/Dockerfile.end-user

@@ -91,7 +91,7 @@ ONBUILD RUN cd basix && cmake -G Ninja -DCMAKE_BUILD_TYPE=${DOLFINX_CMAKE_BUILD_
 ONBUILD RUN cd dolfinx && \
     mkdir -p build-real && \
     cd build-real && \
-    PETSC_ARCH=linux-gnu-real64-32 cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr/local/dolfinx-real -DCMAKE_BUILD_TYPE=${DOLFINX_CMAKE_BUILD_TYPE} ../cpp && \
+    PETSC_ARCH=linux-gnu-real64-32 cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr/local/dolfinx-real -DCMAKE_BUILD_TYPE=${DOLFINX_CMAKE_BUILD_TYPE} -D_REQUIRE_PETSC=ON -D_REQUIRE_SLEPC=ON -D_REQUIRE_SCOTCH=ON -D_REQUIRE_KAHIP=ON -D_REQUIRE_ADIOS2=ON ../cpp && \
     ninja install && \
     cd ../python && \
     PETSC_ARCH=linux-gnu-real64-32 pip -v install \