From 93996124cfc1c1b97990b8cc2f6db5843a1b3be2 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Fri, 13 Nov 2026 12:49:34 -0500 Subject: [PATCH] Update to Alpine 3.24.4 and JDK 25.0.5.0.3_p1 Signed-off-by: Andriy Redko --- .github/workflows/deploy.yml | 2 +- .github/workflows/test.yml | 2 +- Dockerfile | 6 +++--- README.md | 8 ++++---- build-bin/README.md | 2 +- build-bin/docker/docker_args | 6 +++--- install.sh | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6fa18c0..c24ae6e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,7 +7,7 @@ name: deploy # See https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet on: push: - tags: '[0-9]+.[0-9]+.[0-9]+**' # Ex. 8.472.08 or 25.0.2_p10 + tags: '[0-9]+.[0-9]+.[0-9]+**' # Ex. 8.472.08 or 25.0.5.0.3_p1 jobs: deploy: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 15e692e..588d2e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: matrix: # match with maven-enforcer-plugin rules in pom.xml include: - name: build-arg - version: 25.0.2_p10 + version: 25.0.5.0.3_p1 - name: implicit version: master steps: diff --git a/Dockerfile b/Dockerfile index aaf9817..ed9f6d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # docker_parent_image is the base layer of full and jre image # # Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/alpine -ARG docker_parent_image=ghcr.io/openzipkin/alpine:3.23.3 +ARG docker_parent_image=ghcr.io/openzipkin/alpine:3.24.4 # java_version and java_home are hard-coded here to allow the following: # * `docker build https://github.com/openzipkin/docker-java.git` @@ -17,7 +17,7 @@ ARG docker_parent_image=ghcr.io/openzipkin/alpine:3.23.3 # When updating, also update the README # * Use current version from https://pkgs.alpinelinux.org/packages?name=openjdk25, stripping # the `-rX` at the end. -ARG java_version=25.0.2_p10 +ARG java_version=25.0.5.0.3_p1 ARG java_home=/usr/lib/jvm/java-25-openjdk FROM $docker_parent_image AS base @@ -47,7 +47,7 @@ ENTRYPOINT ["java", "-jar"] FROM base AS jdk LABEL org.opencontainers.image.description="OpenJDK on Alpine Linux" ARG java_version -ARG maven_version=3.9.14 +ARG maven_version=3.9.16 LABEL maven-version=$maven_version # QEMU misemulates ppc64le crypto instructions, causing TLS failures (bad_record_mac). diff --git a/README.md b/README.md index 8092810..0cf5dc9 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ This is an internal base layer primarily used in [zipkin](https://github.com/ope To try the image, run the `java -version` command: ```bash -$ docker run --rm ghcr.io/openzipkin/java:25.0.2_p10 -version +$ docker run --rm ghcr.io/openzipkin/java:25.0.5.0.3_p1 -version openjdk version "25.0.2" 2026-01-20 OpenJDK Runtime Environment (build 25.0.2+10-alpine-r1) OpenJDK 64-Bit Server VM (build 25.0.2+10-alpine-r1, mixed mode, sharing) @@ -39,8 +39,8 @@ Build the [Dockerfile](Dockerfile) using the current version without the revision classifier from here: * https://pkgs.alpinelinux.org/packages?name=openjdk25 ```bash -# Note 25.0.2_p10 not 25.0.2_p10-r0! -./build-bin/build 25.0.2_p10 +# Note 25.0.5.0.3_p1 not 25.0.5.0.3_p1-r1! +./build-bin/build 25.0.5.0.3_p1 ``` Next, verify the built image matches that version: @@ -51,7 +51,7 @@ OpenJDK Runtime Environment (build 25.0.2+10-alpine-r1) OpenJDK 64-Bit Server VM (build 25.0.2+10-alpine-r1, mixed mode, sharing) ``` -To release the image, push a tag matching the arg to `build-bin/build` (ex `25.0.2_p10`). +To release the image, push a tag matching the arg to `build-bin/build` (ex `25.0.5.0.3_p1`). This triggers a [GitHub Actions](https://github.com/openzipkin/docker-java/actions) job to push the image. ## java.lang.ClassNotFoundException diff --git a/build-bin/README.md b/build-bin/README.md index d50cdb5..09d5711 100644 --- a/build-bin/README.md +++ b/build-bin/README.md @@ -99,7 +99,7 @@ explicitly defined and `on.tags` is a [glob pattern](https://docs.github.com/en/ ```yaml on: push: - tags: '[0-9]+.[0-9]+.[0-9]+**' # e.g. 8.472.08 or 25.0.2_p10 + tags: '[0-9]+.[0-9]+.[0-9]+**' # e.g. 8.472.08 or 25.0.5.0.3_p1 branches: master jobs: diff --git a/build-bin/docker/docker_args b/build-bin/docker/docker_args index 53744e3..d62c9ab 100755 --- a/build-bin/docker/docker_args +++ b/build-bin/docker/docker_args @@ -37,7 +37,7 @@ if [ -n "${DOCKER_TARGET}" ]; then fi # When non-empty, becomes the base layer including tag appropriate for the image being built. -# e.g. ghcr.io/openzipkin/java:25.0.2_p10-jre +# e.g. ghcr.io/openzipkin/java:25.0.5.0.3_p1-jre # # This is not required to be a base (FROM scratch) image like ghcr.io/openzipkin/alpine:3.12.3 # See https://docs.docker.com/glossary/#parent-image @@ -49,13 +49,13 @@ if [ -n "${DOCKER_PARENT_IMAGE}" ]; then docker_args="${docker_args} --build-arg docker_parent_image=${DOCKER_PARENT_IMAGE}" fi -# When non-empty, becomes the build-arg alpine_version. e.g. "3.23.3" +# When non-empty, becomes the build-arg alpine_version. e.g. "3.24.4" # Used to align base layers from https://github.com/orgs/openzipkin/packages/container/package/alpine if [ -n "${ALPINE_VERSION}" ]; then docker_args="${docker_args} --build-arg alpine_version=${ALPINE_VERSION}" fi -# When non-empty, becomes the build-arg java_version. e.g. "25.0.2_p10" +# When non-empty, becomes the build-arg java_version. e.g. "25.0.5.0.3_p1" # Used to align base layers from https://github.com/orgs/openzipkin/packages/container/package/java if [ -n "${JAVA_VERSION}" ]; then docker_args="${docker_args} --build-arg java_version=${JAVA_VERSION}" diff --git a/install.sh b/install.sh index cf78e89..b3dbe1b 100755 --- a/install.sh +++ b/install.sh @@ -19,7 +19,7 @@ maybe_log_crash() { } java_version=${1?java_version is required. ex --strip-debug} -maven_version=${2?maven_version is required. ex 3.9.14} +maven_version=${2?maven_version is required. ex 3.9.16} java_major_version=$(echo ${java_version}| cut -f1 -d .) package=openjdk${java_major_version}