feat: PSSVG Docker Publishing ( Fixes #165 )

Improving Latest Support
StartAutomating · Apr 14, 2024 · 8526b70 · 8526b70
1 parent 11a0482
commit 8526b70
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 12 deletions.
diff --git a/.github/workflows/TestAndPublish.yml b/.github/workflows/TestAndPublish.yml
@@ -596,25 +596,33 @@ jobs:
         uses: StartAutomating/EZOut@master
       - name: UseHelpOut
         uses: StartAutomating/HelpOut@master
-      - name: Log in to the Container registry
+      - name: Log in to ghcr.io
         uses: docker/login-action@master
         with: 
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
+      - name: Extract Docker Metadata (for branch)
+        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 Docker Metadata (for main)
+        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.ref_name == 'main' || github.ref_name == 'master' || github.ref_name == 'latest'}}
         uses: docker/build-push-action@master
         with: 
           context: .
           push: true
-          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.ref_name != 'main' && github.ref_name != 'master' && github.ref_name != 'latest'}}
         uses: docker/build-push-action@master

diff --git a/Build/GitHub/Jobs/MakePSSVG.psd1 b/Build/GitHub/Jobs/MakePSSVG.psd1
@@ -33,7 +33,7 @@
         'RunEZOut',       
         'RunHelpOut',
         @{
-            'name'='Log in to the Container registry'
+            'name'='Log in to ghcr.io'
             'uses'='docker/login-action@master'
             'with'=@{
                 'registry'='${{ env.REGISTRY }}'
@@ -42,22 +42,33 @@
             }
         },
         @{
-            'name'='Extract metadata (tags, labels) for Docker'
-            'id'='meta'
-            'uses'='docker/metadata-action@master'
-            'with'=@{
+            name = 'Extract Docker Metadata (for branch)'
+            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 Docker Metadata (for main)'
+            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.ref_name == ''main'' || github.ref_name == ''master'' || github.ref_name == ''latest''}}'
             uses = 'docker/build-push-action@master'
-            'with'=@{
+            with = @{
                 'context'='.'
                 'push'='true'
-                'tags'='latest'
-                'labels'='${{ steps.meta.outputs.labels }}'
+                'tags'='${{ steps.metaMain.outputs.tags }}'
+                'labels'='${{ steps.metaMain.outputs.labels }}'
             }
         },
         @{