diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/codestart.yml b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/codestart.yml index 8e3b14b3cc70f..abd0be27dd9e7 100644 --- a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/codestart.yml +++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/codestart.yml @@ -5,12 +5,12 @@ language: data: dockerfile: jvm: - from: registry.access.redhat.com/ubi8/ubi-minimal:8.1 + from: registry.access.redhat.com/ubi8/ubi-minimal:8.3 java-package: java-11-openjdk-headless run-java-version: 1.3.8 fast-jar: - from: registry.access.redhat.com/ubi8/ubi-minimal:8.1 + from: registry.access.redhat.com/ubi8/ubi-minimal:8.3 java-package: java-11-openjdk-headless run-java-version: 1.3.8 native: - from: registry.access.redhat.com/ubi8/ubi-minimal:8.1 + from: registry.access.redhat.com/ubi8/ubi-minimal:8.3 diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-fast-jar.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-fast-jar.ftl index 90610cb4aeb61..39a3e02582e03 100644 --- a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-fast-jar.ftl +++ b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-fast-jar.ftl @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/${project_artifactId}-fast-jar # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 ARG JAVA_PACKAGE=java-11-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-jvm.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-jvm.ftl index fd0f8df0255f9..704c5073d52cb 100644 --- a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-jvm.ftl +++ b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-jvm.ftl @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/${project_artifactId}-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 ARG JAVA_PACKAGE=java-11-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native.ftl index e8d51e133e419..a9fe968e96d48 100644 --- a/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native.ftl +++ b/devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native.ftl @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/${project_artifactId} # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartGenerationTest.java b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartGenerationTest.java index a2559a80a1320..6ac4a501dc33c 100644 --- a/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartGenerationTest.java +++ b/integration-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartGenerationTest.java @@ -535,18 +535,18 @@ private void checkDockerfilesWithMaven(Path projectDir) { assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists() .satisfies(checkContains("./mvnw package")) .satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm")) - .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.1")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3")) .satisfies(checkContains("ARG JAVA_PACKAGE=java-11-openjdk-headless")) .satisfies(checkContains("ENTRYPOINT [ \"/deployments/run-java.sh\" ]")); assertThat(projectDir.resolve("src/main/docker/Dockerfile.fast-jar")).exists() .satisfies(checkContains("./mvnw package -Dquarkus.package.type=fast-jar")) .satisfies(checkContains("docker build -f src/main/docker/Dockerfile.fast-jar")) - .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.1")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3")) .satisfies(checkContains("ARG JAVA_PACKAGE=java-11-openjdk-headless")) .satisfies(checkContains("ENTRYPOINT [ \"/deployments/run-java.sh\" ]")); assertThat(projectDir.resolve("src/main/docker/Dockerfile.native")).exists() .satisfies(checkContains("./mvnw package -Pnative")) - .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.1")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3")) .satisfies(checkContains("CMD [\"./application\", \"-Dquarkus.http.host=0.0.0.0\"]")); } @@ -555,18 +555,18 @@ private void checkDockerfilesWithGradle(Path projectDir) { assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists() .satisfies(checkContains("./gradlew build")) .satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm")) - .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.1")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3")) .satisfies(checkContains("ARG JAVA_PACKAGE=java-11-openjdk-headless")) .satisfies(checkContains("ENTRYPOINT [ \"/deployments/run-java.sh\" ]")); assertThat(projectDir.resolve("src/main/docker/Dockerfile.fast-jar")).exists() .satisfies(checkContains("./gradlew build -Dquarkus.package.type=fast-jar")) .satisfies(checkContains("docker build -f src/main/docker/Dockerfile.fast-jar")) - .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.1")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3")) .satisfies(checkContains("ARG JAVA_PACKAGE=java-11-openjdk-headless")) .satisfies(checkContains("ENTRYPOINT [ \"/deployments/run-java.sh\" ]")); assertThat(projectDir.resolve("src/main/docker/Dockerfile.native")).exists() .satisfies(checkContains("./gradlew build -Dquarkus.package.type=native")) - .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.1")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3")) .satisfies(checkContains("CMD [\"./application\", \"-Dquarkus.http.host=0.0.0.0\"]")); } diff --git a/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm b/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm index 92c0f51a55bca..c3215a3faa371 100644 --- a/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm +++ b/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 ARG JAVA_PACKAGE=java-1.8.0-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 @@ -44,4 +44,4 @@ COPY build/*-runner.jar /deployments/app.jar EXPOSE 8080 USER 1001 -ENTRYPOINT [ "/deployments/run-java.sh" ] \ No newline at end of file +ENTRYPOINT [ "/deployments/run-java.sh" ] diff --git a/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native b/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native index cc988f93db69a..844275a593bee 100644 --- a/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native +++ b/integration-tests/gradle/src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 WORKDIR /work/ COPY build/*-runner /work/application @@ -27,4 +27,4 @@ RUN chmod 775 /work /work/application \ EXPOSE 8080 USER 1001 -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] \ No newline at end of file +CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]