Merge pull request #99 from ids-basecamp/development

alpha.9
ids-basecamp · Feb 3, 2024 · 876894a · 876894a
2 parents 946d01e + 66fab69
commit 876894a
Showing 1 changed file with 16 additions and 24 deletions.
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -32,29 +32,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: npx semantic-release
-
-  publish-ch-app:
-    needs: release
-    if: ${{ needs.release.outputs.new_tag_version != '' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
 
-      - name: Login to GitHub Container Registry
-        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Build Docker image
-        env:
-          DOCKER_IMAGE_TAG: ${{ needs.release.outputs.new_tag_version }}
-        run: cd clearing-house-app && docker build -t ghcr.io/truzzt/ids-basecamp-clearing/ch-app:$DOCKER_IMAGE_TAG .
-
-      - name: Push Docker image
-        env:
-          DOCKER_IMAGE_TAG: ${{ needs.release.outputs.new_tag_version }}
-        run: docker push ghcr.io/truzzt/ids-basecamp-clearing/ch-app:$DOCKER_IMAGE_TAG
-
-  publish-ch-edc:
+  publish-docker-images:
     runs-on: ubuntu-latest
     needs: release
     if: ${{ needs.release.outputs.new_tag_version != '' }}
@@ -63,6 +42,16 @@ jobs:
       packages: write
       id-token: write
 
+    strategy:
+      matrix:
+        include:
+          - context: "ch-app"
+            directory: "clearing-house-app"
+            dockerfile: "Dockerfile" 
+          - context: "ch-edc"
+            directory: "clearing-house-edc"
+            dockerfile: "launchers/connector-prod/Dockerfile"
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -73,9 +62,12 @@ jobs:
       - name: Build Docker image
         env:
           DOCKER_IMAGE_TAG: ${{ needs.release.outputs.new_tag_version }}
-        run: cd clearing-house-edc && docker build -t ghcr.io/truzzt/ids-basecamp-clearing/ch-edc:$DOCKER_IMAGE_TAG -f launchers/connector-prod/Dockerfile .
+        run: |
+          cd ${{ matrix.directory }}
+          docker build -t ghcr.io/${{ github.repository }}/${{ matrix.context }}:$DOCKER_IMAGE_TAG -f ${{ matrix.dockerfile }} .
 
       - name: Push Docker image
         env:
           DOCKER_IMAGE_TAG: ${{ needs.release.outputs.new_tag_version }}
-        run: docker push ghcr.io/truzzt/ids-basecamp-clearing/ch-edc:$DOCKER_IMAGE_TAG
+        run: docker push ghcr.io/${{ github.repository }}/${{ matrix.context }}:$DOCKER_IMAGE_TAG 
+