fix: ShowDemo Docker Publishing ( Fixes #105 )

Using flavor
StartAutomating · Apr 14, 2024 · a8baedf · a8baedf
1 parent 414db65
commit a8baedf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/BuildShowDemo.yml b/.github/workflows/BuildShowDemo.yml
@@ -607,35 +607,35 @@ jobs:
       - name: PSA
         uses: StartAutomating/PSA@main
         id: PSA
-      - name: Log in to the Container registry (on main)
-        if: ${{github.event_name != 'pull_request' && (github.ref_name == 'main' || github.ref_name == 'master' || github.ref_name == 'latest')}}
-        uses: docker/login-action@master
-        with: 
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_TOKEN }}
       - name: Log in to the Container registry (on branch)
-        if: ${{github.ref_name != 'main' && github.ref_name != 'master' && github.ref_name == 'latest'}}
         uses: docker/login-action@master
         with: 
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract metadata (tags, labels) for Docker
+        if: ${{github.ref_name != 'main' && github.ref_name != 'master' && github.ref_name != 'latest'}}
         id: meta
         uses: docker/metadata-action@master
         with: 
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      - name: Extract metadata (tags, labels) for Docker
+        if: ${{github.ref_name == 'main' || github.ref_name == 'master' || github.ref_name == 'latest'}}
+        id: metaMain
+        uses: docker/metadata-action@master
+        with: 
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: latest=true
       - name: Build and push Docker image (from main)
-        if: ${{github.event_name != 'pull_request' && (github.ref_name == 'main' || github.ref_name == 'master' || github.ref_name == 'latest')}}
+        if: ${{github.ref_name == 'main' || github.ref_name == 'master' || github.ref_name == 'latest'}}
         uses: docker/build-push-action@master
         with: 
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }},latest
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.metaMain.outputs.tags }}
+          labels: ${{ steps.metaMain.outputs.labels }}
       - name: Build and push Docker image (from branch)
-        if: ${{github.event_name != 'pull_request' && (github.ref_name != 'main' || github.ref_name != 'master' || github.ref_name != 'latest')}}
+        if: ${{github.ref_name != 'main' && github.ref_name != 'master' && github.ref_name != 'latest'}}
         uses: docker/build-push-action@master
         with: 
           context: .

diff --git a/Build/GitHub/Jobs/BuildShowDemo.psd1 b/Build/GitHub/Jobs/BuildShowDemo.psd1
@@ -49,49 +49,49 @@
             name = 'PSA'
             uses = 'StartAutomating/PSA@main'
             id = 'PSA'
-        }
+        }        
         @{
-            'name'='Log in to the Container registry (on main)'
-            if   = '${{github.event_name != ''pull_request'' && (github.ref_name == ''main'' || github.ref_name == ''master'' || github.ref_name == ''latest'')}}'
+            'name'='Log in to the Container registry (on branch)'            
             'uses'='docker/login-action@master'
             'with'=@{
                 'registry'='${{ env.REGISTRY }}'
                 'username'='${{ github.actor }}'
-                'password'='${{ secrets.GHCR_TOKEN }}'
+                'password'='${{ secrets.GITHUB_TOKEN }}'
             }
         },
         @{
-            'name'='Log in to the Container registry (on branch)'
-            if   = '${{github.ref_name != ''main'' && github.ref_name != ''master'' && github.ref_name == ''latest''}}'
-            'uses'='docker/login-action@master'
+            'name'='Extract metadata (tags, labels) for Docker'
+            if   = '${{github.ref_name != ''main'' && github.ref_name != ''master'' && github.ref_name != ''latest''}}'
+            'id'='meta'
+            'uses'='docker/metadata-action@master'
             'with'=@{
-                'registry'='${{ env.REGISTRY }}'
-                'username'='${{ github.actor }}'
-                'password'='${{ secrets.GITHUB_TOKEN }}'
+                'images'='${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}'                
             }
         },
         @{
             'name'='Extract metadata (tags, labels) for Docker'
-            'id'='meta'
+            if   = '${{github.ref_name == ''main'' || github.ref_name == ''master'' || github.ref_name == ''latest''}}'
+            'id'='metaMain'
             'uses'='docker/metadata-action@master'
             'with'=@{
                 'images'='${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}'
+                'flavor'='latest=true'
             }
         },
         @{
             name = 'Build and push Docker image (from main)'
-            if   = '${{github.event_name != ''pull_request'' && (github.ref_name == ''main'' || github.ref_name == ''master'' || github.ref_name == ''latest'')}}'
+            if   = '${{github.ref_name == ''main'' || github.ref_name == ''master'' || github.ref_name == ''latest''}}'
             uses = 'docker/build-push-action@master'
             'with'=@{
                 'context'='.'
                 'push'='true'
-                'tags'='${{ steps.meta.outputs.tags }},latest'
-                'labels'='${{ steps.meta.outputs.labels }}'
+                'tags'='${{ steps.metaMain.outputs.tags }}'
+                'labels'='${{ steps.metaMain.outputs.labels }}'
             }
         },
         @{
             name = 'Build and push Docker image (from branch)'
-            if   = '${{github.event_name != ''pull_request'' && (github.ref_name != ''main'' || github.ref_name != ''master'' || github.ref_name != ''latest'')}}'
+            if   = '${{github.ref_name != ''main'' && github.ref_name != ''master'' && github.ref_name != ''latest''}}'
             uses = 'docker/build-push-action@master'
             with = @{
                 'context'='.'