[systemds] branch main updated: [MINOR] Fixes for docker github actions

[ba...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

baunsgaard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/main by this push:
     new 0c92f5f  [MINOR] Fixes for docker github actions
0c92f5f is described below

commit 0c92f5fbc9ceda1981c9b9b108b3b9df297e3a59
Author: baunsgaard <ba...@tugraz.at>
AuthorDate: Wed Jan 12 11:00:30 2022 +0100

    [MINOR] Fixes for docker github actions
    
    - Fix include statement in docker cd
    - Fix matrix keyword in dokcer github actions
---
 .github/workflows/docker-cd.yml        | 11 ++++-------
 .github/workflows/docker-testImage.yml |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml
index 3af4acb..6696c87 100644
--- a/.github/workflows/docker-cd.yml
+++ b/.github/workflows/docker-cd.yml
@@ -33,11 +33,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - image-pattern: nightly
-            docker-file: sysds.Dockerfile
-        include:
-          - image-pattern: python-nightly
-            docker-file: pythonsysds.Dockerfile
+          - { image-pattern: nightly, docker-file: sysds.Dockerfile }
+          - { image-pattern: python-nightly, docker-file: pythonsysds.Dockerfile }
 
     steps:
     - name: Checkout
@@ -49,7 +46,7 @@ jobs:
       with:
         images: apache/systemds
         tags: |
-          type=schedule,pattern=${{image-pattern}}
+          type=schedule,pattern=${{ matrix.image-pattern }}
 
     # https://github.com/docker/setup-buildx-action
     - name: Set up Docker Buildx
@@ -68,7 +65,7 @@ jobs:
       uses: docker/build-push-action@v2
       with:
         context: .
-        file: ./docker/${{docker-file}}
+        file: ./docker/${{ matrix.docker-file }}
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/docker-testImage.yml b/.github/workflows/docker-testImage.yml
index f3bfa55..8a37de5 100644
--- a/.github/workflows/docker-testImage.yml
+++ b/.github/workflows/docker-testImage.yml
@@ -45,7 +45,7 @@ jobs:
       with:
         images: apache/systemds
         tags: |
-          type=schedule,pattern=${{image-pattern}}
+          type=schedule,pattern=${{ matrix.image-pattern }}
 
     # https://github.com/docker/setup-buildx-action
     - name: Set up Docker Buildx
@@ -64,7 +64,7 @@ jobs:
       uses: docker/build-push-action@v2
       with:
         context: .
-        file: ./docker/${{docker-file}}
+        file: ./docker/${{ matrix.docker-file }}
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}