try fix actions

cscosu · Dec 9, 2023 · 6cc1c04 · 6cc1c04
1 parent 7111723
commit 6cc1c04
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
@@ -12,7 +12,7 @@ jobs:
 
       - id: set-matrix
         run: |
-          echo "matrix=$(find images -type f -name 'Dockerfile.*' | awk -F'.' '{print $2}')" >> $GITHUB_OUTPUT
+          echo "matrix=$(find images -type f -name 'Dockerfile.*' | awk -F'.' '{print $2}' | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
 
   push-ghcr:
     name: Build and push image
@@ -44,12 +44,12 @@ jobs:
       - name: Build image
         run: |
           docker build \
-            --tag ghcr.io/${{ github.repository_owner }}/tag-:${{ matrix.chal }}-${{ steps.vars.outputs.date }} \
-            --tag ghcr.io/${{ github.repository_owner }}/tag-:${{ matrix.chal }}-latest \
+            --tag ghcr.io/${{ github.repository_owner }}/tag-:${{ matrix.chal }}:${{ steps.vars.outputs.date }} \
+            --tag ghcr.io/${{ github.repository_owner }}/tag-:${{ matrix.chal }}:latest \
             --file images/Dockerfile.${{ matrix.chal }} \
             images
 
       - name: Push to ghcr
         run: |
-          docker push ghcr.io/${{ github.repository_owner }}/tag-:${{ matrix.chal }}-${{ steps.vars.outputs.date }}
-          docker push ghcr.io/${{ github.repository_owner }}/tag-:${{ matrix.chal }}-latest
+          docker push ghcr.io/${{ github.repository_owner }}/tag-:${{ matrix.chal }}:${{ steps.vars.outputs.date }}
+          docker push ghcr.io/${{ github.repository_owner }}/tag-:${{ matrix.chal }}:latest
diff --git a/.github/workflows/build-observer.yaml b/.github/workflows/build-observer.yaml
@@ -29,11 +29,11 @@ jobs:
       - name: Build image
         run: |
           docker build \
-            --tag ghcr.io/${{ github.repository_owner }}/tag-observer-${{ steps.vars.outputs.date }} \
-            --tag ghcr.io/${{ github.repository_owner }}/tag-observer-latest \
+            --tag ghcr.io/${{ github.repository_owner }}/tag-observer:${{ steps.vars.outputs.date }} \
+            --tag ghcr.io/${{ github.repository_owner }}/tag-observer:latest \
             observer
 
       - name: Push to ghcr
         run: |
-          docker push ghcr.io/${{ github.repository_owner }}/tag-observer-${{ steps.vars.outputs.date }}
-          docker push ghcr.io/${{ github.repository_owner }}/tag-observer-latest
+          docker push ghcr.io/${{ github.repository_owner }}/tag-observer:${{ steps.vars.outputs.date }}
+          docker push ghcr.io/${{ github.repository_owner }}/tag-observer:latest