From ea7a49b5280c13f1bebb51aa0fd0ff0c71117621 Mon Sep 17 00:00:00 2001 From: sethu-aot Date: Sun, 12 Jan 2025 04:02:31 -0800 Subject: [PATCH 1/6] Updated trivy-scan.yml: Added Docker registry authentication --- .github/workflows/trivy-scan.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 058c821e4..d5dffb822 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -44,6 +44,13 @@ jobs: - { name: "forms-flow-data-analysis-api", tag: "latest" } - { name: "forms-flow-documents-api", tag: "latest" } steps: + - name: Authenticate with Docker Hub + env: + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + run: | + echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - name: Install Trivy run: | sudo apt-get update From 993937b8d6ea465de75c72139bc46f13bc9cddbd Mon Sep 17 00:00:00 2001 From: sethu-aot Date: Sun, 12 Jan 2025 04:08:05 -0800 Subject: [PATCH 2/6] Added Private Image --- .github/workflows/trivy-scan.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index d5dffb822..de9143a03 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -43,6 +43,8 @@ jobs: - { name: "redash", tag: "24.04.0" } - { name: "forms-flow-data-analysis-api", tag: "latest" } - { name: "forms-flow-documents-api", tag: "latest" } + - { name: "forms-flow-webapi-ee", tag: "latest" } + steps: - name: Authenticate with Docker Hub env: From 8f8bc03ad84360977b34e32f260af6a3a4f8a6f3 Mon Sep 17 00:00:00 2001 From: sethu-aot Date: Sun, 12 Jan 2025 04:12:35 -0800 Subject: [PATCH 3/6] Updated trivy-scan.yml --- .github/workflows/trivy-scan.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index de9143a03..4e81b4836 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -46,12 +46,12 @@ jobs: - { name: "forms-flow-webapi-ee", tag: "latest" } steps: - - name: Authenticate with Docker Hub - env: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - run: | - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + # - name: Authenticate with Docker Hub + # env: + # DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + # DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + # run: | + # echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - name: Install Trivy run: | From 17d155872a3ce962481f8192e313edca7405aae2 Mon Sep 17 00:00:00 2001 From: sethu-aot Date: Sun, 12 Jan 2025 04:14:33 -0800 Subject: [PATCH 4/6] Updated trivy-scan.yml --- .github/workflows/trivy-scan.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 4e81b4836..de9143a03 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -46,12 +46,12 @@ jobs: - { name: "forms-flow-webapi-ee", tag: "latest" } steps: - # - name: Authenticate with Docker Hub - # env: - # DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - # DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - # run: | - # echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - name: Authenticate with Docker Hub + env: + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + run: | + echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - name: Install Trivy run: | From e80647d808345e9e143a5d671a8223af3ae516da Mon Sep 17 00:00:00 2001 From: sethu-aot Date: Sun, 12 Jan 2025 04:16:26 -0800 Subject: [PATCH 5/6] Updated trivy-scan.yml: Added Docker registry authentication --- .github/workflows/trivy-scan.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index de9143a03..03d495b90 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -43,7 +43,6 @@ jobs: - { name: "redash", tag: "24.04.0" } - { name: "forms-flow-data-analysis-api", tag: "latest" } - { name: "forms-flow-documents-api", tag: "latest" } - - { name: "forms-flow-webapi-ee", tag: "latest" } steps: - name: Authenticate with Docker Hub From f47c7f768f6ca23912bedc0cf5c37704a37c25eb Mon Sep 17 00:00:00 2001 From: sethu-aot Date: Sun, 19 Jan 2025 20:41:29 -0800 Subject: [PATCH 6/6] Updated trivy-scan.yml: Updated secret variables --- .github/workflows/trivy-scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 03d495b90..1dd9ba97e 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -48,7 +48,7 @@ jobs: - name: Authenticate with Docker Hub env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_ACCESS_TOKEN }} run: | echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin