DEVOPS-2804 Update docker scout creds

wallarm · Jul 16, 2024 · 24c7d0b · 24c7d0b
1 parent 67f8356
commit 24c7d0b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -199,8 +199,14 @@ jobs:
           method: kubernetes
           path: kubernetes-ci
           secrets: |
-            kv-gitlab-ci/data/github/shared/dockerhub-creds user | DOCKERHUB_USER ;
-            kv-gitlab-ci/data/github/shared/dockerhub-creds password | DOCKERHUB_PASSWORD ;
+            kv-gitlab-ci/data/github/shared/docker-hub-wallarmadmin user | DOCKERHUB_USER ;
+            kv-gitlab-ci/data/github/shared/docker-hub-wallarmadmin password | DOCKERHUB_PASSWORD ;
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          password: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
 
       - name: Docker Scout
         uses: docker/scout-action@v1
@@ -210,8 +216,6 @@ jobs:
           to: docker.io/wallarm/node:latest
           only-severities: critical,high
           sarif-file: sarif.output.json
-          dockerhub-user: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
-          dockerhub-password: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
 
 
       - name: Upload scan results to GitHub Security tab

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -140,8 +140,14 @@ jobs:
           method: kubernetes
           path: kubernetes-ci
           secrets: |
-            kv-gitlab-ci/data/github/shared/dockerhub-creds user | DOCKERHUB_USER ;
-            kv-gitlab-ci/data/github/shared/dockerhub-creds password | DOCKERHUB_PASSWORD ;
+            kv-gitlab-ci/data/github/shared/docker-hub-wallarmadmin user | DOCKERHUB_USER ;
+            kv-gitlab-ci/data/github/shared/docker-hub-wallarmadmin password | DOCKERHUB_PASSWORD ;
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          password: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
 
       - name: Docker Scout
         uses: docker/scout-action@v1
@@ -153,5 +159,3 @@ jobs:
           only-severities: critical,high
           write-comment: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          dockerhub-user: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
-          dockerhub-password: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}