Skip to content

Commit

Permalink
Updates to Alpine 3.21.2 and Java 8.432.06 (#96)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <adrian.cole@elastic.co>
  • Loading branch information
codefromthecrypt authored Feb 12, 2025
1 parent d747eac commit c692ea5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
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.20.2
ARG docker_parent_image=ghcr.io/openzipkin/alpine:3.21.2

# We copy files from the context into a scratch container first to avoid a problem where docker and
# docker-compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.
Expand All @@ -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.422.05
ARG java_version=8.432.06
ARG java_home=/usr/lib/jvm/java-1.8-openjdk
LABEL java-version=$java_version
LABEL java-home=$java_home
Expand All @@ -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.422.05
ARG java_version=8.432.06
ARG maven_version=3.9.9
LABEL maven-version=$maven_version

Expand Down
20 changes: 11 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +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
openjdk version "1.8.0_422"
OpenJDK Runtime Environment (IcedTea 3.32.0) (Alpine 8.422.05-r0)
OpenJDK 64-Bit Server VM (build 25.422-b05, mixed mode)
$ 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)
```

## 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.422.05 not 8.422.05-r1!
./build-bin/build 8.422.05
# Note 8.432.06 not 8.432.06-r1!
./build-bin/build 8.432.06
```

Next, verify the built image matches that version:
```bash
openjdk version "1.8.0_422"
OpenJDK Runtime Environment (IcedTea 3.32.0) (Alpine 8.422.05-r0)
OpenJDK 64-Bit Server VM (build 25.422-b05, mixed mode)
$ 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)
```

To release the image, push a tag matching the arg to `build-bin/build` (ex `8.422.05`).
To release the image, push a tag matching the arg to `build-bin/build` (ex `8.432.06`).
This triggers a [GitHub Actions](https://github.com/openzipkin/docker-java/actions) job to push the image.

0 comments on commit c692ea5

Please sign in to comment.