diff --git a/build-bin/docker/docker_args b/build-bin/docker/docker_args index c396708..fe711a0 100755 --- a/build-bin/docker/docker_args +++ b/build-bin/docker/docker_args @@ -46,7 +46,7 @@ if [ -n "${DOCKER_TARGET}" ]; then fi # When non-empty, becomes the base layer including tag appropriate for the image being built. -# e.g. ghcr.io/openzipkin/java:21.0.1_p12-jre +# e.g. ghcr.io/openzipkin/java:21.0.2_p13-jre # # This is not required to be a base (FROM scratch) image like ghcr.io/openzipkin/alpine:3.12.3 # See https://docs.docker.com/glossary/#parent-image @@ -60,7 +60,7 @@ if [ -n "${ALPINE_VERSION}" ]; then docker_args="${docker_args} --build-arg alpine_version=${ALPINE_VERSION}" fi -# When non-empty, becomes the build-arg java_version. e.g. "21.0.1_p12" +# When non-empty, becomes the build-arg java_version. e.g. "21.0.2_p13" # Used to align base layers from https://github.com/orgs/openzipkin/packages/container/package/java if [ -n "${JAVA_VERSION}" ]; then docker_args="${docker_args} --build-arg java_version=${JAVA_VERSION}" diff --git a/build-bin/docker_args b/build-bin/docker_args index 917343d..d4fb434 100755 --- a/build-bin/docker_args +++ b/build-bin/docker_args @@ -8,7 +8,7 @@ else exit 1 fi -JAVA_VERSION=${JAVA_VERSION:-21.0.1_p12} +JAVA_VERSION=${JAVA_VERSION:-21.0.2_p13} # DOCKER_ARCHS to eventually push to the registry DOCKER_ARCHS="amd64 arm64" @@ -27,13 +27,13 @@ case "${JRE_VERSION}" in DOCKER_PARENT_IMAGE=ghcr.io/openzipkin/java:8.392.08-jre ;; 11 ) - DOCKER_PARENT_IMAGE=ghcr.io/openzipkin/java:11.0.21_p9-jre + DOCKER_PARENT_IMAGE=ghcr.io/openzipkin/java:11.0.22_p7-jre ;; 17 ) - DOCKER_PARENT_IMAGE=ghcr.io/openzipkin/java:17.0.9_p8-jre + DOCKER_PARENT_IMAGE=ghcr.io/openzipkin/java:17.0.10_p7-jre ;; 21 ) - DOCKER_PARENT_IMAGE=ghcr.io/openzipkin/java:21.0.1_p12-jre + DOCKER_PARENT_IMAGE=ghcr.io/openzipkin/java:21.0.2_p13-jre ;; * ) echo "Invalid JRE_VERSION: ${JRE_VERSION}" diff --git a/docker/Dockerfile b/docker/Dockerfile index 7f899bf..93fae4c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ # non-root users and such as they are not intended to run in production anyway. # The image binaries this example builds are installed over -ARG docker_parent_image=ghcr.io/openzipkin/java:21.0.1_p12 +ARG docker_parent_image=ghcr.io/openzipkin/java:21.0.2_p13 # 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. @@ -12,7 +12,7 @@ FROM scratch as scratch COPY . /code/ ## Use JDK 11 to build projects, as that can still compile Java 6 -FROM ghcr.io/openzipkin/java:11.0.21_p9 as install +FROM ghcr.io/openzipkin/java:11.0.22_p7 as install WORKDIR /code COPY --from=scratch /code .