From 993a14e830437d49b0d6a40b179f819e43de4149 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 13 Feb 2025 08:15:46 +0800 Subject: [PATCH] Updates to Java 8.442.06 Signed-off-by: Adrian Cole --- Dockerfile | 4 ++-- README.md | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index eeb8d58..47914ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ FROM $docker_parent_image AS base # * Use current version from https://pkgs.alpinelinux.org/packages?name=openjdk8 # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG java_version=8.432.06 +ARG java_version=8.442.06 ARG java_home=/usr/lib/jvm/java-1.8-openjdk LABEL java-version=$java_version LABEL java-home=$java_home @@ -41,7 +41,7 @@ ENTRYPOINT ["java", "-jar"] # The JDK image includes a few build utilities and Maven FROM base AS jdk LABEL org.opencontainers.image.description="OpenJDK on Alpine Linux" -ARG java_version=8.432.06 +ARG java_version=8.442.06 ARG maven_version=3.9.9 LABEL maven-version=$maven_version diff --git a/README.md b/README.md index d504f85..362ebf9 100644 --- a/README.md +++ b/README.md @@ -15,27 +15,27 @@ 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:8.432.06 -version -openjdk version "1.8.0_432" -OpenJDK Runtime Environment (IcedTea 3.33.0) (Alpine 8.432.06-r1) -OpenJDK 64-Bit Server VM (build 25.432-b06, mixed mode) +$ docker run --rm ghcr.io/openzipkin/java:8.442.06 -version +openjdk version "1.8.0_442" +OpenJDK Runtime Environment (IcedTea 3.34.0) (Alpine 8.442.06-r0) +OpenJDK 64-Bit Server VM (build 25.442-b06, mixed mode) ``` ## Release process Build the `Dockerfile` using the current version without the revision classifier from here: * https://pkgs.alpinelinux.org/packages?name=openjdk8 ```bash -# Note 8.432.06 not 8.432.06-r1! -./build-bin/build 8.432.06 +# Note 8.442.06 not 8.442.06-r1! +./build-bin/build 8.442.06 ``` Next, verify the built image matches that version: ```bash $ docker run --rm openzipkin/java:test -version -openjdk version "1.8.0_432" -OpenJDK Runtime Environment (IcedTea 3.33.0) (Alpine 8.432.06-r1) -OpenJDK 64-Bit Server VM (build 25.432-b06, mixed mode) +openjdk version "1.8.0_442" +OpenJDK Runtime Environment (IcedTea 3.34.0) (Alpine 8.442.06-r0) +OpenJDK 64-Bit Server VM (build 25.442-b06, mixed mode) ``` -To release the image, push a tag matching the arg to `build-bin/build` (ex `8.432.06`). +To release the image, push a tag matching the arg to `build-bin/build` (ex `8.442.06`). This triggers a [GitHub Actions](https://github.com/openzipkin/docker-java/actions) job to push the image.