From 24c7d0bf8b46b86425cd5a00cb4d5d3db8c09842 Mon Sep 17 00:00:00 2001 From: Nikita Nedvetskii Date: Tue, 16 Jul 2024 17:35:21 +0200 Subject: [PATCH] DEVOPS-2804 Update docker scout creds --- .github/workflows/build.yaml | 12 ++++++++---- .github/workflows/ci.yaml | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d709251..44c0815 100644 --- 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 index abb79d1..80ce9cd 100644 --- 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 }}