Przeglądaj źródła

Simplify metadata generation

https://github.com/docker/metadata-action?tab=readme-ov-file#latest-tag
Agus Lopez 1 rok temu
rodzic
commit
461af595c7
1 zmienionych plików z 7 dodań i 20 usunięć
  1. 7 20
      .github/workflows/docker-publish.yml

+ 7 - 20
.github/workflows/docker-publish.yml

@@ -46,7 +46,7 @@ jobs:
     needs: variables
     runs-on: ubuntu-latest
     env:
-      IMAGE_NAME: ${{ needs.variables.outputs.image_name }}
+      IMAGE_NAME: ${{ github.event_name != 'pull_request' && needs.variables.outputs.image_name || github.event.repository.name }}
     outputs:
       image-needs-updating: ${{ steps.check.outputs.needs-updating }}
     steps:
@@ -63,7 +63,7 @@ jobs:
     needs: [check, variables]
 
     env:
-      IMAGE_NAME: ${{ needs.variables.outputs.image_name }}
+      IMAGE_NAME: ${{ github.event_name != 'pull_request' && needs.variables.outputs.image_name || github.event.repository.name }}
 
     if: |
       github.event_name != 'schedule' ||
@@ -85,7 +85,6 @@ jobs:
           password: ${{ env.REGISTRY_PASSWORD }}
 
       - name: Extract Docker metadata
-        if: github.event_name != 'pull_request'
         id: meta
         uses: docker/metadata-action@v5
         with:
@@ -97,23 +96,11 @@ jobs:
             org.opencontainers.image.base.name=docker.io/${{ env.IMAGE_BASE }}
           tags: |
             type=sha
-            type=schedule,pattern={{date 'YYYYMMDD'}}
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Extract Docker PR tag
-        if: github.event_name == 'pull_request'
-        id: meta_pr
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.REGISTRY_URL }}/${{ env.REGISTRY_USERNAME }}/${{ env.REPO_NAME }}
-          flavor: |
-            latest=false
-          tags: |
-            type=sha
-            type=ref,event=pr
+            type=schedule,pattern={{date 'YYYYMMDD'}},enable=${{ github.event_name != 'pull_request' }}
+            type=semver,pattern={{version}},enable=${{ github.event_name != 'pull_request' }}
+            type=semver,pattern={{major}}.{{minor}},enable=${{ github.event_name != 'pull_request' }}
+            type=raw,value=latest,enable={{is_default_branch}},enable=${{ github.event_name != 'pull_request' }}
+            type=ref,event=pr,enable=${{ github.event_name == 'pull_request' }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3