Skip to content

Commit be5766c

Browse files
cescoffiergsmet
authored andcommitted
Update runtime container images (UBI and OpenJDK)
Fix #49476
1 parent 781df57 commit be5766c

File tree

30 files changed

+41
-41
lines changed

30 files changed

+41
-41
lines changed

core/deployment/src/main/java/io/quarkus/deployment/images/ContainerImages.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* <p>
1010
* - {@code x_IMAGE_NAME} - the name of the image without the version (e.g. {@code registry.access.redhat.com/ubi9/ubi-minimal})
1111
* - {@code x_VERSION} - the version of the image (e.g. {@code 9.5})
12-
* - {@code x} - the full image name (e.g. {@code registry.access.redhat.com/ubi9/ubi-minimal:9.5})
12+
* - {@code x} - the full image name (e.g. {@code registry.access.redhat.com/ubi9/ubi-minimal:9.6})
1313
*/
1414
public class ContainerImages {
1515

@@ -23,17 +23,17 @@ public class ContainerImages {
2323
/**
2424
* UBI 9 version
2525
*/
26-
public static final String UBI9_VERSION = "9.5";
26+
public static final String UBI9_VERSION = "9.6";
2727

2828
/**
2929
* Version used for more UBI8 Java images.
3030
*/
31-
public static final String UBI8_JAVA_VERSION = "1.21";
31+
public static final String UBI8_JAVA_VERSION = "1.23";
3232

3333
/**
3434
* Version used for more UBI9 Java images.
3535
*/
36-
public static final String UBI9_JAVA_VERSION = "1.21";
36+
public static final String UBI9_JAVA_VERSION = "1.23";
3737

3838
/**
3939
* Version uses for the native builder image.

devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@
146146
"project": {
147147
"default-codestart": "rest",
148148
"codestart-data": {
149-
"tooling-dockerfiles.dockerfile.jvm.from-template": "registry.access.redhat.com/ubi9/openjdk-{java.version}:1.21",
150-
"tooling-dockerfiles.dockerfile.jvm.from": "registry.access.redhat.com/ubi9/openjdk-${recommended-java-version}:1.21",
151-
"tooling-dockerfiles.dockerfile.native.from": "registry.access.redhat.com/ubi9/ubi-minimal:9.5",
149+
"tooling-dockerfiles.dockerfile.jvm.from-template": "registry.access.redhat.com/ubi9/openjdk-{java.version}:1.23",
150+
"tooling-dockerfiles.dockerfile.jvm.from": "registry.access.redhat.com/ubi9/openjdk-${recommended-java-version}:1.23",
151+
"tooling-dockerfiles.dockerfile.native.from": "registry.access.redhat.com/ubi9/ubi-minimal:9.6",
152152
"tooling-dockerfiles.dockerfile.native-micro.from": "quay.io/quarkus/ubi9-quarkus-micro-image:2.0"
153153
},
154154
"properties": {

docs/src/main/asciidoc/building-native-image.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ The project generation has also provided a `Dockerfile.native` in the `src/main/
564564

565565
[source,dockerfile]
566566
----
567-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
567+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6
568568
WORKDIR /work/
569569
RUN chown 1001 /work \
570570
&& chmod "g+rwX" /work \

docs/src/main/asciidoc/quarkus-runtime-base-image.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ In this case, you need to use a multi-stage `dockerfile` to copy the required li
3838
[source, dockerfile]
3939
----
4040
# First stage - install the dependencies in an intermediate container
41-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 as BUILD
41+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6 as BUILD
4242
RUN microdnf install freetype -y
4343
4444
# Second stage - copy the dependencies
@@ -60,7 +60,7 @@ If you need to have access to the full AWT support, you need more than just `lib
6060
[source, dockerfile]
6161
----
6262
# First stage - install the dependencies in an intermediate container
63-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 as BUILD
63+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6 as BUILD
6464
RUN microdnf install freetype fontconfig -y
6565
6666
# Second stage - copy the dependencies
@@ -109,7 +109,7 @@ To use this base image, use the following `Dockerfile`:
109109

110110
[source, dockerfile]
111111
----
112-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
112+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6
113113
WORKDIR /work/
114114
RUN chown 1001 /work \
115115
&& chmod "g+rwX" /work \

extensions/container-image/container-image-docker-common/deployment/src/test/resources/ubi8-openjdk-17-runtime

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.21
1+
FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.23
22

33
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
44

extensions/container-image/container-image-docker-common/deployment/src/test/resources/ubi8-openjdk-21-runtime

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use Java 21 base image
2-
FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:1.21
2+
FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:1.23
33

44
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
55

extensions/container-image/container-image-docker-common/deployment/src/test/resources/ubi9-java17

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
1+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6
22

33
ARG JAVA_PACKAGE=java-17-openjdk-headless
44
ARG RUN_JAVA_VERSION=1.3.8

extensions/container-image/container-image-docker-common/deployment/src/test/resources/ubi9-java21

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
1+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6
22

33
ARG JAVA_PACKAGE=java-21-openjdk-headless
44
ARG RUN_JAVA_VERSION=1.3.8

extensions/container-image/container-image-docker-common/deployment/src/test/resources/ubi9-openjdk-17-runtime

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/openjdk-17-runtime:1.21
1+
FROM registry.access.redhat.com/ubi9/openjdk-17-runtime:1.23
22

33
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
44

extensions/container-image/container-image-docker-common/deployment/src/test/resources/ubi9-openjdk-21-runtime

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use Java 21 base image
2-
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.21
2+
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.23
33

44
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
55

0 commit comments

Comments
 (0)