fix scout!

shelajev · Sep 24, 2024 · aed5e9d · aed5e9d
1 parent a872636
commit aed5e9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/dbc.yml b/.github/workflows/dbc.yml
@@ -36,8 +36,10 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          tags: "olegselajev241/todo-demo-application:latest"
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/todo-demo-application:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/todo-demo-application:${{ env.SHA }}
           # For pull requests, export results to the build cache.
           # Otherwise, push to a registry.
-          outputs: ${{ github.event_name == 'pull_request' && 'type=cacheonly' || 'type=registry,push=true' }}
+          outputs: 'type=registry,push=true'
 
diff --git a/.github/workflows/scout.yml b/.github/workflows/scout.yml
@@ -1,4 +1,4 @@
-name: Docker
+name: scout
 
 on:
   workflow_run:
@@ -7,11 +7,8 @@ on:
       - completed
 
 env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: docker.io
   IMAGE_NAME: olegselajev241/todo-demo-application
   SHA: ${{ github.event.pull_request.head.sha || github.event.after }}
-  # Use `latest` as the tag to compare to if empty, assuming that it's already pushed
   COMPARE_TAG: latest
 
 jobs:
@@ -22,12 +19,11 @@ jobs:
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v2.1.0
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
           username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
@@ -45,10 +41,9 @@ jobs:
 
       - name: Docker Scout
         id: docker-scout
-        if: ${{ github.event_name == 'pull_request' }}
         uses: docker/scout-action@v1
         with:
           command: quickview
-          image: olegselajev241/todo-demo-application:latest
+          image: olegselajev241/todo-demo-application:${{ env.SHA }}
           only-severities: critical,high
           write-comment: false