From 1a31c939fa0d42aca364673b67edcf78883b8d10 Mon Sep 17 00:00:00 2001
From: Rosie Wood <rwood@turing.ac.uk>
Date: Wed, 1 Nov 2023 14:18:13 +0000
Subject: [PATCH 1/2] update workflow

---
 .github/workflows/build_docker_image.yaml | 29 ++++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build_docker_image.yaml b/.github/workflows/build_docker_image.yaml
index 64afdc96..bb4024d8 100644
--- a/.github/workflows/build_docker_image.yaml
+++ b/.github/workflows/build_docker_image.yaml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+      - "pulumi"
     tags:
       - "*"
 
@@ -13,11 +14,20 @@ env:
 
 jobs:
   build-and-push-image:
-    name: Push Docker image to GitHub container repository
+    name: Push Docker images to GitHub container repository
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - dockerfile: docker/reginald/Dockerfile
+            image: ghcr.io/${{ github.repository }}_reginald
+          - dockerfile: docker/slack_bot/Dockerfile
+            image: ghcr.io/${{ github.repository }}_slackbot
     permissions:
       packages: write
       contents: read
+    
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
@@ -33,21 +43,12 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: |
-            ghcr.io/${{ github.repository }}
+          images: ${{ matrix.image }}
 
-      - name: Build and push Docker image for the Reginald app
+      - name: Build and push Docker images
         uses: docker/build-push-action@v4
         with:
-          file: docker/reginald/Dockerfile
+          file: ${{ matrix.dockerfile }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-      - name: Build and push Docker image for the slack-bot only app
-        uses: docker/build-push-action@v4
-        with:
-          file: docker/slack_bot/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file

From a8a88e718c316d361a961716a60d43b181670bd0 Mon Sep 17 00:00:00 2001
From: rchan <rchan@turing.ac.uk>
Date: Wed, 1 Nov 2023 16:32:08 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=8E=A8=20apply=20lint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build_docker_image.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_docker_image.yaml b/.github/workflows/build_docker_image.yaml
index bb4024d8..8d811ee4 100644
--- a/.github/workflows/build_docker_image.yaml
+++ b/.github/workflows/build_docker_image.yaml
@@ -27,7 +27,7 @@ jobs:
     permissions:
       packages: write
       contents: read
-    
+
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
@@ -51,4 +51,4 @@ jobs:
           file: ${{ matrix.dockerfile }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta.outputs.labels }}