Skip to content

Commit 1e0d4b0

Browse files
geoandgeoand
authored
Merge pull request #34009 from davidvoit/jib-ubi-version-update
Container JIB: Update base ubi openjdk to tag version to 1.16
2 parents a7e4d28 + 46fea1e commit 1e0d4b0

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
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.15");
19+
assertThat(v.getBaseImage()).isEqualTo("registry.access.redhat.com/ubi8/openjdk-11-runtime:1.16");
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.15");
29+
assertThat(v.getBaseImage()).isEqualTo("registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16");
3030
assertThat(v.getJavaVersion()).isEqualTo(17);
3131
});
3232
}

‎extensions/container-image/container-image-docker/deployment/src/test/resources/openjdk-11-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-11-runtime:1.15
1+
FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:1.16
22

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

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

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ public class JibConfig {
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.15}
19+
* When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16}
2020
* is used as the default.
21-
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11-runtime:1.15} is used as the default.
21+
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11-runtime:1.16} 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
@@ -90,8 +90,8 @@ public class JibProcessor {
9090
private static final IsClassPredicate IS_CLASS_PREDICATE = new IsClassPredicate();
9191
private static final String BINARY_NAME_IN_CONTAINER = "application";
9292

93-
private static final String JAVA_17_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.15";
94-
private static final String JAVA_11_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.15";
93+
private static final String JAVA_17_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16";
94+
private static final String JAVA_11_BASE_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11-runtime:1.16";
9595
private static final String DEFAULT_BASE_IMAGE_USER = "185";
9696

9797
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/OpenshiftConfig.java‎

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

18-
public static final String DEFAULT_BASE_JVM_JDK11_IMAGE = "registry.access.redhat.com/ubi8/openjdk-11:1.15";
19-
public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17:1.15";
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";
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

@@ -46,9 +46,9 @@ public static String getDefaultJvmImage(CompiledJavaVersionBuildItem.JavaVersion
4646
/**
4747
* The base image to be used when a container image is being produced for the jar build.
4848
*
49-
* When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17:1.15}
49+
* When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17:1.16}
5050
* is used as the default.
51-
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11:1.15} is used as the default.
51+
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11:1.16} is used as the default.
5252
*/
5353
@ConfigItem
5454
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.15";
16-
public static final String DEFAULT_BASE_JVM_JDK17_IMAGE = "registry.access.redhat.com/ubi8/openjdk-17:1.15";
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";
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.15}
44+
* When the application is built against Java 17 or higher, {@code registry.access.redhat.com/ubi8/openjdk-17:1.16}
4545
* is used as the default.
46-
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11:1.15} is used as the default.
46+
* Otherwise {@code registry.access.redhat.com/ubi8/openjdk-11:1.16} 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: 1 addition & 1 deletion
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.15
80+
FROM registry.access.redhat.com/ubi8/openjdk-{java.version}:1.16
8181

8282
ENV LANGUAGE='en_US:en'
8383

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,13 +297,13 @@ private void checkDockerfilesWithMaven(Path projectDir) {
297297
assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists()
298298
.satisfies(checkContains("./mvnw package"))
299299
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm"))
300-
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.15"))//TODO: make a test for java17
300+
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.16"))//TODO: make a test for java17
301301
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
302302
.satisfies(checkNotContains("ENTRYPOINT"));
303303
assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists()
304304
.satisfies(checkContains("./mvnw package -Dquarkus.package.type=legacy-jar"))
305305
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar"))
306-
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.15"))
306+
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-11:1.16"))
307307
.satisfies(checkContains("EXPOSE 8080"))
308308
.satisfies(checkContains("USER 185"))
309309
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))

0 commit comments

Comments
 (0)