Skip to content

Commit 7ae8e29

Browse files
gsmetgsmet
authored
Merge pull request quarkusio#35983 from gsmet/runtime-1.17
Update Java runtime images to 1.17
2 parents 841b3a1 + bcc9ca5 commit 7ae8e29

File tree

9 files changed

+26
-26
lines changed

9 files changed

+26
-26
lines changed

‎extensions/container-image/container-image-docker/deployment/src/test/java/io/quarkus/container/image/docker/deployment/RedHatOpenJDKRuntimeBaseProviderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ void testImageWithJava11() {
1616
Path path = getPath("openjdk-11-runtime");
1717
var result = sut.determine(path);
1818
assertThat(result).hasValueSatisfying(v -> {
19-
assertThat(v.getBaseImage()).isEqualTo("registry.access.redhat.com/ubi8/openjdk-11-runtime:1.16");
19+
assertThat(v.getBaseImage()).isEqualTo("registry.access.redhat.com/ubi8/openjdk-11-runtime:1.17");
2020
assertThat(v.getJavaVersion()).isEqualTo(11);
2121
});
2222
}
@@ -26,7 +26,7 @@ void testImageWithJava17() {
2626
Path path = getPath("openjdk-17-runtime");
2727
var result = sut.determine(path);
2828
assertThat(result).hasValueSatisfying(v -> {
29-
assertThat(v.getBaseImage()).isEqualTo("registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16");
29+
assertThat(v.getBaseImage()).isEqualTo("registry.access.redhat.com/ubi8/openjdk-17-runtime:1.17");
3030
assertThat(v.getJavaVersion()).isEqualTo(17);
3131
});
3232
}

‎extensions/container-image/container-image-docker/deployment/src/test/resources/openjdk-11-runtime‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:1.16
1+
FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:1.17
22

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

5-
# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
6-
ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
5+
# Append additional options to the java process, you can add -XshowSettings:vm to also display the heap size.
6+
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
77

88
# We make four distinct layers so if there are application changes the library layers can be re-used
99
COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Use Java 17 base image
2-
FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16
2+
FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.17
33

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

6-
# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
7-
ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
6+
# Append additional options to the java process, you can add -XshowSettings:vm to also display the heap size.
7+
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
88

99
# We make four distinct layers so if there are application changes the library layers can be re-used
1010
COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/

‎extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/ContainerImageJibConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ public class ContainerImageJibConfig {
1616
/**
1717
* The base image to be used when a container image is being produced for the jar build.
1818
*
19-
* When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16}
19+
* When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17-runtime:1.17}
2020
* is used as the default.
21-
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11-runtime:1.16} is used as the default.
21+
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11-runtime:1.17} is used as the default.
2222
*/
2323
@ConfigItem
2424
public Optional<String> baseJvmImage;

‎extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public class JibProcessor {
9292
private static final IsClassPredicate IS_CLASS_PREDICATE = new IsClassPredicate();
9393
private static final String BINARY_NAME_IN_CONTAINER = "application";
9494

95-
private static final String JAVA_17_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16";
96-
private static final String JAVA_11_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.16";
95+
private static final String JAVA_17_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.17";
96+
private static final String JAVA_11_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.17";
9797
private static final String DEFAULT_BASE_IMAGE_USER = "185";
9898

9999
private static final String OPENTELEMETRY_CONTEXT_CONTEXT_STORAGE_PROVIDER_SYS_PROP = "io.opentelemetry.context.contextStorageProvider";

‎extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/ContainerImageOpenshiftConfig.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
@ConfigRoot(name = "openshift", phase = ConfigPhase.BUILD_TIME)
1616
public class ContainerImageOpenshiftConfig {
1717

18-
public static final String DEFAULT_BASE_JVM_JDK11_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11:1.16";
19-
public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17:1.16";
18+
public static final String DEFAULT_BASE_JVM_JDK11_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11:1.17";
19+
public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17:1.17";
2020
public static final String DEFAULT_BASE_NATIVE_IMAGE = "quay.io/quarkus/ubi-quarkus-native-binary-s2i:2.0";
2121
public static final String DEFAULT_NATIVE_TARGET_FILENAME = "application";
2222

@@ -48,9 +48,9 @@ public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion
4848
* The value of this property is used to create an ImageStream for the builder image used in the Openshift build.
4949
* When it references images already available in the internal Openshift registry, the corresponding streams are used
5050
* instead.
51-
* When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17:1.16}
51+
* When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17:1.17}
5252
* is used as the default.
53-
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11:1.16} is used as the default.
53+
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11:1.17} is used as the default.
5454
*/
5555
@ConfigItem
5656
public Optional<String> baseJvmImage;

‎extensions/container-image/container-image-openshift/deployment/src/main/java/io/quarkus/container/image/openshift/deployment/S2iConfig.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
1313
public class S2iConfig {
1414

15-
public static final String DEFAULT_BASE_JVM_JDK11_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11:1.16";
16-
public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17:1.16";
15+
public static final String DEFAULT_BASE_JVM_JDK11_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11:1.17";
16+
public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17:1.17";
1717
public static final String DEFAULT_BASE_NATIVE_IMAGE = "quay.io/quarkus/ubi-quarkus-native-binary-s2i:2.0";
1818
public static final String DEFAULT_NATIVE_TARGET_FILENAME = "application";
1919

@@ -41,9 +41,9 @@ public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion
4141
/**
4242
* The base image to be used when a container image is being produced for the jar build.
4343
*
44-
* When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17:1.16}
44+
* When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17:1.17}
4545
* is used as the default.
46-
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11:1.16} is used as the default.
46+
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11:1.17} is used as the default.
4747
*/
4848
@ConfigItem
4949
public Optional<String> baseJvmImage;

‎independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-layout.include.qute‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
# accessed directly. (example: "foo.example.com,bar.example.com")
7878
#
7979
###
80-
FROM registry.access.redhat.com/ubi8/openjdk-{java.version}:1.16
80+
FROM registry.access.redhat.com/ubi8/openjdk-{java.version}:1.17
8181

8282
ENV LANGUAGE='en_US:en'
8383

@@ -88,7 +88,7 @@ USER 185
8888
{#if java.version == '11'}
8989
ENV AB_JOLOKIA_OFF=""
9090
{/if}
91-
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
91+
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
9292
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
9393

9494
ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]

‎independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,13 +315,13 @@ private void checkDockerfilesWithMaven(Path projectDir) {
315315
assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists()
316316
.satisfies(checkContains("./mvnw package"))
317317
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm"))
318-
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.16"))//TODO: make a test for java17
318+
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.17"))//TODO: make a test for java17
319319
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
320320
.satisfies(checkContains("ENTRYPOINT [ \"/opt/jboss/container/java/run/run-java.sh\" ]"));
321321
assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists()
322322
.satisfies(checkContains("./mvnw package -Dquarkus.package.type=legacy-jar"))
323323
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar"))
324-
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.16"))
324+
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.17"))
325325
.satisfies(checkContains("EXPOSE 8080"))
326326
.satisfies(checkContains("USER 185"))
327327
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
@@ -341,13 +341,13 @@ private void checkDockerfilesWithGradle(Path projectDir) {
341341
assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists()
342342
.satisfies(checkContains("./gradlew build"))
343343
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm"))
344-
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.16"))//TODO: make a test for java17
344+
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.17"))//TODO: make a test for java17
345345
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
346346
.satisfies(checkContains("ENTRYPOINT [ \"/opt/jboss/container/java/run/run-java.sh\" ]"));
347347
assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists()
348348
.satisfies(checkContains("./gradlew build -Dquarkus.package.type=legacy-jar"))
349349
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar"))
350-
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.16"))
350+
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.17"))
351351
.satisfies(checkContains("EXPOSE 8080"))
352352
.satisfies(checkContains("USER 185"))
353353
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))

0 commit comments

Comments
 (0)