From 95818a0e83efab18956aa3289d8f3fb0853b58da Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Tue, 8 Jun 2021 13:28:11 +0300 Subject: [PATCH] Bump to ubi-minimal:8.4 --- docs/src/main/asciidoc/building-native-image.adoc | 2 +- .../quarkus/tooling/dockerfiles/codestart.yml | 6 +++--- .../quarkus/QuarkusCodestartGenerationTest.java | 12 ++++++------ .../src/main/docker/Dockerfile.jvm | 2 +- .../src/main/docker/Dockerfile.jvm | 2 +- .../application/src/main/docker/Dockerfile.jvm | 2 +- .../application/src/main/docker/Dockerfile.native | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/src/main/asciidoc/building-native-image.adoc b/docs/src/main/asciidoc/building-native-image.adoc index 730fcf2c68d69..0ed4b8ec2f9e3 100644 --- a/docs/src/main/asciidoc/building-native-image.adoc +++ b/docs/src/main/asciidoc/building-native-image.adoc @@ -522,7 +522,7 @@ COPY src /project/src RUN ./mvnw package -Pnative ## Stage 2 : create the docker final image -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 WORKDIR /work/ COPY --from=build /project/target/*-runner /work/application diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/dockerfiles/codestart.yml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/dockerfiles/codestart.yml index 3a3d6f97845a4..3a09f50daef71 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/dockerfiles/codestart.yml +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/dockerfiles/codestart.yml @@ -5,14 +5,14 @@ language: data: dockerfile: jvm: - from: registry.access.redhat.com/ubi8/ubi-minimal:8.3 + from: registry.access.redhat.com/ubi8/ubi-minimal:8.4 java-package: java-11-openjdk-headless run-java-version: 1.3.8 legacy-jar: - from: registry.access.redhat.com/ubi8/ubi-minimal:8.3 + from: registry.access.redhat.com/ubi8/ubi-minimal:8.4 java-package: java-11-openjdk-headless run-java-version: 1.3.8 native: - from: registry.access.redhat.com/ubi8/ubi-minimal:8.3 + from: registry.access.redhat.com/ubi8/ubi-minimal:8.4 native-distroless: from: quay.io/quarkus/quarkus-distroless-image:1.0 diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java index 6e308575a010d..8604367bbb870 100644 --- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java +++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartGenerationTest.java @@ -274,18 +274,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.3")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.4")) .satisfies(checkContains("ARG JAVA_PACKAGE=java-11-openjdk-headless")) .satisfies(checkContains("ENTRYPOINT [ \"/deployments/run-java.sh\" ]")); assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists() .satisfies(checkContains("./mvnw package -Dquarkus.package.type=legacy-jar")) .satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar")) - .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.4")) .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.3")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.4")) .satisfies(checkContains("CMD [\"./application\", \"-Dquarkus.http.host=0.0.0.0\"]")); } @@ -294,18 +294,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.3")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.4")) .satisfies(checkContains("ARG JAVA_PACKAGE=java-11-openjdk-headless")) .satisfies(checkContains("ENTRYPOINT [ \"/deployments/run-java.sh\" ]")); assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists() .satisfies(checkContains("./gradlew build -Dquarkus.package.type=legacy-jar")) .satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar")) - .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.3")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.4")) .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.3")) + .satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal:8.4")) .satisfies(checkContains("CMD [\"./application\", \"-Dquarkus.http.host=0.0.0.0\"]")); } diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm index 6e349aaf8576a..395944b2a1f2d 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/rest-client-quickstart-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 ARG JAVA_PACKAGE=java-11-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm index 6e349aaf8576a..395944b2a1f2d 100644 --- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm +++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/rest-client-quickstart-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 ARG JAVA_PACKAGE=java-11-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 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 c3215a3faa371..b8da067fe7b15 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.3 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 ARG JAVA_PACKAGE=java-1.8.0-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 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 844275a593bee..dffcbfe22eb6a 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.3 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 WORKDIR /work/ COPY build/*-runner /work/application