From 50513aff8462f5edc7fe649f9ab48988c3ac0a31 Mon Sep 17 00:00:00 2001 From: Ravi Singal Date: Tue, 12 Nov 2024 11:29:55 +0530 Subject: [PATCH 1/5] chore: update base image --- java-11/base.image | 2 +- java-21/base.image | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-11/base.image b/java-11/base.image index 1f802ae..cf5338c 100644 --- a/java-11/base.image +++ b/java-11/base.image @@ -1 +1 @@ -gcr.io/distroless/cc-debian12:debug@sha256:133c2e182e87c72c5efff9a3743f31542841425e9810b4a8371a9b95e06d1bd7 \ No newline at end of file +gcr.io/distroless/cc-debian12:debug@sha256:ae6f470336acbf2aeffea3db70ec0e74d69bee7270cdb5fa2f28fe840fad57fe \ No newline at end of file diff --git a/java-21/base.image b/java-21/base.image index 1f802ae..cf5338c 100644 --- a/java-21/base.image +++ b/java-21/base.image @@ -1 +1 @@ -gcr.io/distroless/cc-debian12:debug@sha256:133c2e182e87c72c5efff9a3743f31542841425e9810b4a8371a9b95e06d1bd7 \ No newline at end of file +gcr.io/distroless/cc-debian12:debug@sha256:ae6f470336acbf2aeffea3db70ec0e74d69bee7270cdb5fa2f28fe840fad57fe \ No newline at end of file From ce27bf76f37cecbd5d0a7a99ff0e50458d833108 Mon Sep 17 00:00:00 2001 From: Ravi Singal Date: Tue, 12 Nov 2024 11:51:09 +0530 Subject: [PATCH 2/5] update java version --- java-11/java.version | 2 +- java-21/java.version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-11/java.version b/java-11/java.version index cd5659f..cf3389e 100644 --- a/java-11/java.version +++ b/java-11/java.version @@ -1 +1 @@ -11.0.24-11.74 \ No newline at end of file +11.0.25-11.76 \ No newline at end of file diff --git a/java-21/java.version b/java-21/java.version index 96d2ae2..64fd145 100644 --- a/java-21/java.version +++ b/java-21/java.version @@ -1 +1 @@ -21.0.4-21.36 \ No newline at end of file +21.0.5-21.38 \ No newline at end of file From b45b397cbd9269ca8f102dee4acf5a39e5c2960b Mon Sep 17 00:00:00 2001 From: Ravi Singal Date: Tue, 12 Nov 2024 12:37:34 +0530 Subject: [PATCH 3/5] disable docker login as workaround to docker ratelimiting --- .github/workflows/pr-build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 407a093..941a5de 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -22,11 +22,11 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_READ_USER }} - password: ${{ secrets.DOCKERHUB_READ_TOKEN }} + # - name: Login to Docker Hub + # uses: docker/login-action@v3 + # with: + # username: ${{ secrets.DOCKERHUB_READ_USER }} + # password: ${{ secrets.DOCKERHUB_READ_TOKEN }} - name: Read Java Version shell: bash From ddc8706e18fb990eeffa83388bf0d59384cf29e1 Mon Sep 17 00:00:00 2001 From: Ravi Singal Date: Tue, 12 Nov 2024 13:05:09 +0530 Subject: [PATCH 4/5] test new trivy db source --- .github/workflows/pr-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 941a5de..cd067de 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -22,11 +22,11 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - # - name: Login to Docker Hub - # uses: docker/login-action@v3 - # with: - # username: ${{ secrets.DOCKERHUB_READ_USER }} - # password: ${{ secrets.DOCKERHUB_READ_TOKEN }} + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_READ_USER }} + password: ${{ secrets.DOCKERHUB_READ_TOKEN }} - name: Read Java Version shell: bash @@ -49,7 +49,7 @@ jobs: load: true - name: Scan java-${{ matrix.java-major-version}} image - uses: hypertrace/github-actions/trivy-image-scan@main + uses: hypertrace/github-actions/trivy-image-scan@trivy-db-public-ecr with: image: hypertrace/java-build tag: ${{ matrix.java-major-version}} From 8076667c1c8a5f3b0cd27915a12b0ab0e8227c2b Mon Sep 17 00:00:00 2001 From: Ravi Singal Date: Tue, 12 Nov 2024 13:07:46 +0530 Subject: [PATCH 5/5] revert to main branch --- .github/workflows/pr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index cd067de..407a093 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -49,7 +49,7 @@ jobs: load: true - name: Scan java-${{ matrix.java-major-version}} image - uses: hypertrace/github-actions/trivy-image-scan@trivy-db-public-ecr + uses: hypertrace/github-actions/trivy-image-scan@main with: image: hypertrace/java-build tag: ${{ matrix.java-major-version}}