♻️ci: refactor docker workflow

OpenUp-LabTakizawa · Apr 20, 2024 · 6b9993a · 6b9993a
1 parent 354d4dd
commit 6b9993a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
@@ -32,7 +32,8 @@ on:
 env:
   REPOSITORY_OWNER: openup-labtakizawa
   REPOSITORY: marukome0743/homepage
-  GHCR_REPOSITORY: ghcr.io/openup-labtakizawa/homepage
+  GHCR_REGISTRY: ghcr.io
+  GHCR_REPOSITORY: openup-labtakizawa/homepage
   AWS_REGION: ap-northeast-1
   ECR_REPOSITORY: homepage
   LAMBDA_FUNCTION_NAME: homepage
@@ -86,11 +87,11 @@ jobs:
         with:
           images: |
             ${{ env.REPOSITORY }}
-            ${{ env.GHCR_REPOSITORY }}
+            ${{ env.GHCR_REGISTRY }}/${{ env.GHCR_REPOSITORY }}
           tags: |
             type=ref,event=tag
             type=ref,event=pr,prefix=pr-
-            type=raw,value=canary,enable=${{ github.repository_owner == env.REPOSITORY_OWNER && github.ref_name == 'main' }}
+            type=raw,value=canary,enable=${{ github.event_name != 'pull_request_target' }}
         env:
           DOCKER_METADATA_ANNOTATIONS_LEVELS: ${{ fromJSON(env.IS_PUSH) && 'manifest,index' || 'manifest' }}
 
@@ -125,5 +126,4 @@ jobs:
         with:
           command: compare
           image: ${{ env.REPOSITORY }}:${{ steps.meta.outputs.version }}
-          to: ${{ env.GHCR_REPOSITORY }}:canary
           only-severities: critical,high