Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ubi minimal version to 8.3 #13177

Merged
merged 1 commit into from
Nov 9, 2020
Merged

Bump ubi minimal version to 8.3 #13177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...criptor-json/src/main/resources/codestarts/quarkus/core/tooling/dockerfiles/codestart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-fast-jar.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-jvm.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion devtools/platform-descriptor-json/src/main/resources/templates/dockerfile-native.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
12 changes: 6 additions & 6 deletions ...devtools/src/test/java/io/quarkus/devtools/codestarts/QuarkusCodestartGenerationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\"]"));
}

Expand All @@ -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\"]"));
}

Expand Down
4 changes: 2 additions & 2 deletions .../src/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.jvm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -44,4 +44,4 @@ COPY build/*-runner.jar /deployments/app.jar
EXPOSE 8080
USER 1001

ENTRYPOINT [ "/deployments/run-java.sh" ]
ENTRYPOINT [ "/deployments/run-java.sh" ]
4 changes: 2 additions & 2 deletions ...c/test/resources/basic-java-platform-module/application/src/main/docker/Dockerfile.native
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -27,4 +27,4 @@ RUN chmod 775 /work /work/application \
EXPOSE 8080
USER 1001

CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]