Skip to content

Commit c692ea5

Browse files
Updates to Alpine 3.21.2 and Java 8.432.06 (#96)
Signed-off-by: Adrian Cole <[email protected]>
1 parent d747eac commit c692ea5

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# docker_parent_image is the base layer of full and jre image
77
#
88
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/alpine
9-
ARG docker_parent_image=ghcr.io/openzipkin/alpine:3.20.2
9+
ARG docker_parent_image=ghcr.io/openzipkin/alpine:3.21.2
1010

1111
# We copy files from the context into a scratch container first to avoid a problem where docker and
1212
# docker-compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.
@@ -24,7 +24,7 @@ FROM $docker_parent_image AS base
2424
# * Use current version from https://pkgs.alpinelinux.org/packages?name=openjdk8
2525
# This is defined in many places because Docker has no "env" script functionality unless you use
2626
# docker-compose: When updating, update everywhere.
27-
ARG java_version=8.422.05
27+
ARG java_version=8.432.06
2828
ARG java_home=/usr/lib/jvm/java-1.8-openjdk
2929
LABEL java-version=$java_version
3030
LABEL java-home=$java_home
@@ -41,7 +41,7 @@ ENTRYPOINT ["java", "-jar"]
4141
# The JDK image includes a few build utilities and Maven
4242
FROM base AS jdk
4343
LABEL org.opencontainers.image.description="OpenJDK on Alpine Linux"
44-
ARG java_version=8.422.05
44+
ARG java_version=8.432.06
4545
ARG maven_version=3.9.9
4646
LABEL maven-version=$maven_version
4747

README.md

+11-9
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,27 @@ This is an internal base layer primarily used in [zipkin](https://github.com/ope
1515

1616
To try the image, run the `java -version` command:
1717
```bash
18-
openjdk version "1.8.0_422"
19-
OpenJDK Runtime Environment (IcedTea 3.32.0) (Alpine 8.422.05-r0)
20-
OpenJDK 64-Bit Server VM (build 25.422-b05, mixed mode)
18+
$ docker run --rm ghcr.io/openzipkin/java:8.432.06 -version
19+
openjdk version "1.8.0_432"
20+
OpenJDK Runtime Environment (IcedTea 3.33.0) (Alpine 8.432.06-r1)
21+
OpenJDK 64-Bit Server VM (build 25.432-b06, mixed mode)
2122
```
2223

2324
## Release process
2425
Build the `Dockerfile` using the current version without the revision classifier from here:
2526
* https://pkgs.alpinelinux.org/packages?name=openjdk8
2627
```bash
27-
# Note 8.422.05 not 8.422.05-r1!
28-
./build-bin/build 8.422.05
28+
# Note 8.432.06 not 8.432.06-r1!
29+
./build-bin/build 8.432.06
2930
```
3031

3132
Next, verify the built image matches that version:
3233
```bash
33-
openjdk version "1.8.0_422"
34-
OpenJDK Runtime Environment (IcedTea 3.32.0) (Alpine 8.422.05-r0)
35-
OpenJDK 64-Bit Server VM (build 25.422-b05, mixed mode)
34+
$ docker run --rm openzipkin/java:test -version
35+
openjdk version "1.8.0_432"
36+
OpenJDK Runtime Environment (IcedTea 3.33.0) (Alpine 8.432.06-r1)
37+
OpenJDK 64-Bit Server VM (build 25.432-b06, mixed mode)
3638
```
3739

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

0 commit comments

Comments
 (0)