Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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
Expand Down Expand Up @@ -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).
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions build-bin/docker/docker_args
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
Loading