From df406101bd62063060d43fa04d2b38f817457212 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 25 May 2024 06:56:59 +0800 Subject: [PATCH 1/3] Bumps to Alpine 3.20.0 Signed-off-by: Adrian Cole --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f62155..38485ac 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.19.1 +ARG docker_parent_image=ghcr.io/openzipkin/alpine:3.20.0 # java_version and java_home are hard-coded here to allow the following: # * `docker build https://github.com/openzipkin/docker-java.git` From d84741bf959c732943574af7ddbc7b8b8863d944 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 25 May 2024 07:04:01 +0800 Subject: [PATCH 2/3] bump java Signed-off-by: Adrian Cole --- .github/workflows/test.yml | 2 +- Dockerfile | 2 +- README.md | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d562d6e..f702d96 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: matrix: # match with maven-enforcer-plugin rules in pom.xml include: - name: build-arg - version: 21.0.2_p13 + version: 21.0.3_p9 - name: implicit version: master steps: diff --git a/Dockerfile b/Dockerfile index 38485ac..83b9ea7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG docker_parent_image=ghcr.io/openzipkin/alpine:3.20.0 # When updating, also update the README # * Use current version from https://pkgs.alpinelinux.org/packages?name=openjdk21, stripping # the `-rX` at the end. -ARG java_version=21.0.2_p13 +ARG java_version=21.0.3_p9 ARG java_home=/usr/lib/jvm/java-21-openjdk # We copy files from the context into a scratch container first to avoid a problem where docker and diff --git a/README.md b/README.md index 927534f..6c315e5 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:21.0.2_p13 -version +$ docker run --rm ghcr.io/openzipkin/java:21.0.3_p9 -version openjdk version "21.0.2" 2024-01-16 OpenJDK Runtime Environment (build 21.0.2+13-alpine-r2) OpenJDK 64-Bit Server VM (build 21.0.2+13-alpine-r2, 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=openjdk21 ```bash -# Note 21.0.2_p13 not 21.0.2_p13-r2! -./build-bin/build 21.0.2_p13 +# Note 21.0.3_p9 not 21.0.3_p9-r2! +./build-bin/build 21.0.3_p9 ``` Next, verify the built image matches that version: @@ -51,7 +51,7 @@ OpenJDK Runtime Environment (build 21.0.2+13-alpine-r2) OpenJDK 64-Bit Server VM (build 21.0.2+13-alpine-r2, mixed mode, sharing) ``` -To release the image, push a tag matching the arg to `build-bin/build` (ex `21.0.2_p13`). +To release the image, push a tag matching the arg to `build-bin/build` (ex `21.0.3_p9`). This triggers a [GitHub Actions](https://github.com/openzipkin/docker-java/actions) job to push the image. ## java.lang.ClassNotFoundException From 46823b198210d642ee25cb4c8c55f4678f2d5c21 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 25 May 2024 07:12:01 +0800 Subject: [PATCH 3/3] fix readme Signed-off-by: Adrian Cole --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6c315e5..b940346 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ 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:21.0.3_p9 -version -openjdk version "21.0.2" 2024-01-16 -OpenJDK Runtime Environment (build 21.0.2+13-alpine-r2) -OpenJDK 64-Bit Server VM (build 21.0.2+13-alpine-r2, mixed mode, sharing) +openjdk version "21.0.3" 2024-04-16 +OpenJDK Runtime Environment (build 21.0.3+9-alpine-r0) +OpenJDK 64-Bit Server VM (build 21.0.3+9-alpine-r0, mixed mode, sharing) ``` ## Release process @@ -46,9 +46,9 @@ revision classifier from here: Next, verify the built image matches that version: ```bash $ docker run --rm openzipkin/java:test -version -openjdk version "21.0.2" 2024-01-16 -OpenJDK Runtime Environment (build 21.0.2+13-alpine-r2) -OpenJDK 64-Bit Server VM (build 21.0.2+13-alpine-r2, mixed mode, sharing) +openjdk version "21.0.3" 2024-04-16 +OpenJDK Runtime Environment (build 21.0.3+9-alpine-r0) +OpenJDK 64-Bit Server VM (build 21.0.3+9-alpine-r0, mixed mode, sharing) ``` To release the image, push a tag matching the arg to `build-bin/build` (ex `21.0.3_p9`).