From 9e52f6cc2f9bce931900f5c7724174a59ef008a3 Mon Sep 17 00:00:00 2001
From: Erik Heeren <erik.heeren@epfl.ch>
Date: Wed, 9 Oct 2024 12:02:43 +0200
Subject: [PATCH] Try multiple containers through the power of matrices!

---
 .github/workflows/spacktainer.yaml                    | 11 +++++++----
 .../amd64/{brayns.yaml => brayns/spack.yaml}          |  0
 2 files changed, 7 insertions(+), 4 deletions(-)
 rename container_definitions/amd64/{brayns.yaml => brayns/spack.yaml} (100%)

diff --git a/.github/workflows/spacktainer.yaml b/.github/workflows/spacktainer.yaml
index 04d6485..7f50546 100644
--- a/.github/workflows/spacktainer.yaml
+++ b/.github/workflows/spacktainer.yaml
@@ -59,6 +59,9 @@ jobs:
           SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }}
           SPACK_DEPLOYMENT_KEY_PRIVATE: ${{ secrets.SPACK_DEPLOYMENT_KEY_PRIVATE }}
   spacktainer-build-job:
+    strategy:
+      matrix:
+        spacktainer: [py-brain-indexer, brayns]
     runs-on:
       - codebuild-spacktainers-${{ github.run_id }}-${{ github.run_attempt }}
       - image:ubuntu-7.0
@@ -71,7 +74,7 @@ jobs:
         env:
           AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }}
         run: |-
-          cd container_definitions/amd64/py-brain-indexer
+          cd container_definitions/amd64/${{ matrix.spacktainer }}
           cat << EOF > Dockerfile
           FROM ${AWS_ECR_URL}/spacktainers/builder:latest AS builder
           FROM ${AWS_ECR_URL}/spacktainers/runtime:latest
@@ -79,14 +82,14 @@ jobs:
           # Triggers building the 'builder' image, otherwise it is optimized away
           COPY --from=builder /etc/debian_version /etc/debian_version
           EOF
-      - name: build py-brain-indexer
+      - name: build ${{ matrix.spacktainer }}
         uses: ./.github/actions/build_container
         with:
           AWS_ECR_URL: ${{ secrets.AWS_ECR_URL }}
-          AWS_ECR_PATH: /spacktainers/py-brain-indexer
+          AWS_ECR_PATH: /spacktainers/${{ matrix.spacktainer }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
-          BUILD_PATH: container_definitions/amd64/py-brain-indexer
+          BUILD_PATH: container_definitions/amd64/${{ matrix.spacktainer }}
           BUILDAH_EXTRA_ARGS: --label org.opencontainers.image.revision="$GITHUB_SHA"
             --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR" --label
             org.opencontainers.image.url="https://github.com/${GITHUB_REPOSITORY}"
diff --git a/container_definitions/amd64/brayns.yaml b/container_definitions/amd64/brayns/spack.yaml
similarity index 100%
rename from container_definitions/amd64/brayns.yaml
rename to container_definitions/amd64/brayns/spack.yaml