From: Marc Fehling <mafehling.git@gmail.com>
Date: Wed, 20 Sep 2023 00:47:23 +0000 (-0600)
Subject: Split building docker images to two separate workers.
X-Git-Tag: relicensing~488^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F16016%2Fhead;p=dealii.git

Split building docker images to two separate workers.
---

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a236df96ed..55fd8b6e5b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,7 +12,14 @@ permissions:
 
 jobs:
   build-master-docker:
+    name: build master docker ${{ matrix.ubuntu_version }}
     runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ubuntu_version: ["focal", "jammy"]
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -26,26 +33,14 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and push Docker image of master focal
-        uses: docker/build-push-action@v5
-        with:
-          context: ./contrib/docker/
-          cache-from: type=registry,ref=dealii/dependencies:focal
-          cache-to: type=inline
-          build-args: |
-            VER=master
-            IMG=focal
-          push: ${{github.ref_name == 'master'}}
-          tags: dealii/dealii:master-focal
-
-      - name: Build and push Docker image of master jammy
+      - name: Build and push Docker image of master ${{ matrix.ubuntu_version }}
         uses: docker/build-push-action@v5
         with:
           context: ./contrib/docker/
-          cache-from: type=registry,ref=dealii/dependencies:jammy
+          cache-from: type=registry,ref=dealii/dependencies:${{ matrix.ubuntu_version }}
           cache-to: type=inline
           build-args: |
             VER=master
-            IMG=jammy
+            IMG=${{ matrix.ubuntu_version }}
           push: ${{github.ref_name == 'master'}}
-          tags: dealii/dealii:master-jammy
+          tags: dealii/dealii:master-${{ matrix.ubuntu_version }}