Skip to content

Commit

Permalink
fix version
Browse files Browse the repository at this point in the history
  • Loading branch information
adriancole committed Dec 17, 2020
1 parent f90a4ac commit ff8b5a4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
# * `docker build https://github.com/openzipkin/docker-java.git`
#
# When updating, also update the README
# * Use current version from https://hub.docker.com/r/azul/zulu-openjdk-alpine/tags?page=1&name=7u
# 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=7u285
FROM azul/zulu-openjdk-alpine:${java_version}
# * This is the version output from building the image
ARG java_version=1.7.0_285
FROM azul/zulu-openjdk-alpine:7u285
ARG maintainer="OpenZipkin https://gitter.im/openzipkin/zipkin"
LABEL maintainer=$maintainer
LABEL org.opencontainers.image.authors=$maintainer
Expand Down
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,23 @@
`ghcr.io/openzipkin/java` is a minimal Docker image based on [azul/zulu-openjdk-alpine](https://hub.docker.com/r/azul/zulu-openjdk-alpine).

GitHub Container Registry: [ghcr.io/openzipkin/java](https://github.com/orgs/openzipkin/packages/container/package/java) includes:
* release tag corresponds to a [Current OpenJDK Version](https://hub.docker.com/r/azul/zulu-openjdk-alpine/tags?name=7u)

* `MAJOR.MINOR.PATCH` tag: release corresponding to the java version

## Using this image
This is an internal base layer primarily used in [zipkin](https://github.com/openzipkin/zipkin).

To try the image, run the `java -version` command:
```bash
docker run --rm ghcr.io/openzipkin/java:7u285 -version
docker run --rm ghcr.io/openzipkin/java:1.7.0_285 -version
openjdk version "1.7.0_285"
OpenJDK Runtime Environment (Zulu 7.42.0.51-CA-linux64) (build 1.7.0_285-b01)
OpenJDK 64-Bit Server VM (Zulu 7.42.0.51-CA-linux64) (build 24.285-b01, mixed mode)
```

## Release process
Build the `Dockerfile` using the current tag without the revision classifier from here:
* https://hub.docker.com/r/azul/zulu-openjdk-alpine/tags?name=7u
Build the `Dockerfile`
```bash
# Note 7u285 not 7u285-7.42.0.51
./build-bin/build 7u285
./build-bin/build
```

Next, verify the built image matches that version:
Expand All @@ -34,5 +31,5 @@ OpenJDK Runtime Environment (Zulu 7.42.0.51-CA-linux64) (build 1.7.0_285-b01)
OpenJDK 64-Bit Server VM (Zulu 7.42.0.51-CA-linux64) (build 24.285-b01, mixed mode)
```

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

0 comments on commit ff8b5a4

Please sign in to comment.