docker login

tadashi0713 · Nov 18, 2024 · 35ec855 · 35ec855
1 parent 9bec8f1
commit 35ec855
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -9,7 +9,7 @@ env:
   AWS_REGION: 'ap-northeast-1'
   AWS_ROLE_ARN: 'arn:aws:iam::175142243308:role/tadashi-docker-scout-demo-role'
   ECR_REGISTRY: '175142243308.dkr.ecr.ap-northeast-1.amazonaws.com'
-  REPOSITORY: 'tadashi/docker-scout-demo'
+  ECR_REPOSITORY: 'tadashi/docker-scout-demo'
   DOCKERHUB_REPOSITORY: 'tadashinemoto567/docker-scout-demo'
   IMAGE_TAG: ${{ github.sha }}
   DOCKER_SCOUT_HUB_USER: ${{ secrets.DOCKER_USERNAME }}
@@ -22,6 +22,10 @@ jobs:
       id-token: write
       contents: read
     steps:
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
       - uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: ${{ env.AWS_REGION }}
@@ -31,11 +35,11 @@ jobs:
           registry: ${{ env.ECR_REGISTRY }}
       - uses: docker/build-push-action@v6
         with:
-          tags: ${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
+          tags: ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
       - uses: docker/scout-action@v1
         with:
           command: environment
-          image: ${{ env.ECR_REGISTRY }}/${{ env.REPOSITORY }}:${{ env.IMAGE_TAG }}
+          image: ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
           environment: staging
           organization: tadashinemoto567
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  AWS_REPOSITORY: 'tadashi/docker-scout-demo'
+  ECR_REPOSITORY: 'tadashi/docker-scout-demo'
   IMAGE_TAG: ${{ github.sha }}
   DOCKER_SCOUT_HUB_USER: ${{ secrets.DOCKER_USERNAME }}
   DOCKER_SCOUT_HUB_PASSWORD: ${{ secrets.DOCKER_TOKEN }}
@@ -46,11 +46,11 @@ jobs:
           registry: ${{ env.ECR_REGISTRY }}
       - uses: docker/build-push-action@v6
         with:
-          tags: ${{ env.ECR_REGISTRY }}/${{ env.AWS_REPOSITORY }}:${{ env.IMAGE_TAG }}
+          tags: ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
       - id: docker-scout
         uses: docker/scout-action@v1
         with:
           command: compare
-          image: ${{ env.AWS_REPOSITORY }}:${{ env.IMAGE_TAG }}
+          image: ${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
           to-env: production
           organization: tadashinemoto567