From f98809452fbe7dd49bb478bd4818c6c456246176 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Wed, 18 Dec 2024 17:05:10 +0000 Subject: [PATCH 1/2] Amend Alpine JDK/JRE8 to use Alpine 3.19 build container (#1084) --- linux/jdk/alpine/src/main/packaging/Dockerfile | 2 +- linux/jre/alpine/src/main/packaging/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/jdk/alpine/src/main/packaging/Dockerfile b/linux/jdk/alpine/src/main/packaging/Dockerfile index 3b037e2b4..4c9f9522f 100644 --- a/linux/jdk/alpine/src/main/packaging/Dockerfile +++ b/linux/jdk/alpine/src/main/packaging/Dockerfile @@ -1,6 +1,6 @@ ARG CONTAINER_REGISTRY="" -FROM ${CONTAINER_REGISTRY}alpine +FROM ${CONTAINER_REGISTRY}alpine:3.19 ENV GOSU_VERSION 1.14 RUN set -eux; \ diff --git a/linux/jre/alpine/src/main/packaging/Dockerfile b/linux/jre/alpine/src/main/packaging/Dockerfile index dd827a885..8c835318a 100644 --- a/linux/jre/alpine/src/main/packaging/Dockerfile +++ b/linux/jre/alpine/src/main/packaging/Dockerfile @@ -1,6 +1,6 @@ ARG CONTAINER_REGISTRY="" -FROM ${CONTAINER_REGISTRY}alpine +FROM ${CONTAINER_REGISTRY}alpine:3.19 ENV GOSU_VERSION 1.14 RUN set -eux; \ From 4d9055f595add565d812d84779c8a92c767ef14e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:27:32 +1300 Subject: [PATCH 2/2] Bump actions/setup-java from 4.5.0 to 4.6.0 (#1081) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.5.0 to 4.6.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/8df1039502a15bceb9433410b1a100fbe190c53b...7a6d8a8234af8eb26422e24e3006232cccaa061b) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cacert-publish.yml | 2 +- .github/workflows/linux.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml index 5289c96c6..945a4c616 100644 --- a/.github/workflows/cacert-publish.yml +++ b/.github/workflows/cacert-publish.yml @@ -40,7 +40,7 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0 + - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 with: java-version: '17' java-package: jdk diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3169fc0fb..a2f7149d3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -114,7 +114,7 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0 + - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 with: java-version: 17 java-package: jdk @@ -148,7 +148,7 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0 + - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 with: java-version: 17 java-package: jdk