From 0e5ffa6e74da37367839b1df4f776b06ec8bbbc7 Mon Sep 17 00:00:00 2001 From: Gautam Panchal <97419311+GautamMPanchaL@users.noreply.github.com> Date: Sat, 24 Oct 2026 09:27:01 +0530 Subject: [PATCH 1/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 786531e..01b80a7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ ## Docker JRE Base -Base images for Hypertrace java-based docker images \ No newline at end of file +Base images for Hypertrace java-based docker images From 2f6b7d8c13713abe679fb877410b4d18230513ee Mon Sep 17 00:00:00 2001 From: GautamMPanchaL Date: Sat, 24 Oct 2026 09:57:44 +0530 Subject: [PATCH 2/2] Fix CI: update runner to ubuntu-24.04, build-push-action to v6, switch trivy to log output The Trivy scan was failing with "Path does not exist: trivy-results.sarif" due to Node.js 24 incompatibility with pinned action versions on the runner. Co-Authored-By: Claude Opus 4.6 --- .github/workflows/pr-build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 407a093..def8e54 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: java-major-version: [11, 21] @@ -38,7 +38,7 @@ jobs: echo BASE_IMAGE=${BASE_IMAGE} >> $GITHUB_OUTPUT - name: Build java-${{ matrix.java-major-version}} - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: java-${{ matrix.java-major-version}} platforms: ${{ matrix.platform }} @@ -53,5 +53,4 @@ jobs: with: image: hypertrace/java-build tag: ${{ matrix.java-major-version}} - category: java-${{ matrix.java-major-version}} - output-mode: github + output-mode: log