Skip to content

Commit faa1a74

Browse files
ia3andygsmet
ia3andy
authored and
gsmet
committed
Add template based data for dockerfile
(cherry picked from commit 430d1db)
1 parent 384e1f2 commit faa1a74

File tree

5 files changed

+26
-13
lines changed

5 files changed

+26
-13
lines changed

‎devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"name": "Artificial Intelligence (AI)",
9292
"id": "ai",
9393
"description": "Help making Artificial Intgelligence (AI)-infused applications using Large Language Models and more"
94-
9594
},
9695
{
9796
"name": "Cloud",
@@ -146,6 +145,12 @@
146145
"metadata":{
147146
"project": {
148147
"default-codestart": "rest",
148+
"codestart-data": {
149+
"dockerfile.jvm.from-template": "registry.access.redhat.com/ubi9/openjdk-{java.version}:1.21",
150+
"dockerfile.jvm.from": "registry.access.redhat.com/ubi9/openjdk-${recommended-java-version}:1.21",
151+
"dockerfile.native.from": "registry.access.redhat.com/ubi9/ubi-minimal:9.5",
152+
"dockerfile.native-micro": "quay.io/quarkus/ubi9-quarkus-micro-image:2.0"
153+
},
149154
"properties": {
150155
"doc-root": "https://quarkus.io",
151156
"rest-assured-version": "${rest-assured.version}",

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,12 @@
7878
# accessed directly. (example: "foo.example.com,bar.example.com")
7979
#
8080
###
81-
{#if dockerfile.jvm.from}
81+
{#if dockerfile.jvm.from-template}
82+
FROM {#eval dockerfile.jvm.from-template /}
83+
{#else if dockerfile.jvm.from}
8284
FROM {dockerfile.jvm.from}
8385
{#else}
84-
FROM registry.access.redhat.com/ubi9/openjdk-{java.version}:1.21
86+
FROM registry.access.redhat.com/ubi8/openjdk-{java.version}:1.21
8587
{/if}
8688

8789
ENV LANGUAGE='en_US:en'

‎independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/tooling/dockerfiles/codestart.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ language:
55
data:
66
dockerfile:
77
native:
8-
from: registry.access.redhat.com/ubi9/ubi-minimal:9.5
8+
from: registry.access.redhat.com/ubi8/ubi-minimal:8.10
99
native-micro:
10-
from: quay.io/quarkus/ubi9-quarkus-micro-image:2.0
10+
from: quay.io/quarkus/quarkus-micro-image:2.0

‎independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json

+6
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,12 @@
428428
"metadata": {
429429
"project": {
430430
"default-codestart": "resteasy-reactive",
431+
"codestart-data": {
432+
"dockerfile.jvm.from-template": "registry.access.redhat.com/ubi9/openjdk-{java.version}:1.21",
433+
"dockerfile.jvm.from": "registry.access.redhat.com/ubi9/openjdk-${recommended-java-version}:1.21",
434+
"dockerfile.native.from": "registry.access.redhat.com/ubi9/ubi-minimal:9.5",
435+
"dockerfile.native-micro": "quay.io/quarkus/ubi9-quarkus-micro-image:2.0"
436+
},
431437
"properties": {
432438
"doc-root": "https://quarkus.io",
433439
"rest-assured-version": "4.3.2",

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -319,24 +319,24 @@ private void checkDockerfilesWithMaven(Path projectDir) {
319319
assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists()
320320
.satisfies(checkContains("./mvnw package"))
321321
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm"))
322-
.satisfies(checkContains("registry.access.redhat.com/ubi9/openjdk-17:"))
322+
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-17:"))
323323
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
324324
.satisfies(checkContains("ENTRYPOINT [ \"/opt/jboss/container/java/run/run-java.sh\" ]"));
325325
assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists()
326326
.satisfies(checkContains("./mvnw package -Dquarkus.package.jar.type=legacy-jar"))
327327
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar"))
328-
.satisfies(checkContains("registry.access.redhat.com/ubi9/openjdk-17:"))
328+
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-17:"))
329329
.satisfies(checkContains("EXPOSE 8080"))
330330
.satisfies(checkContains("USER 185"))
331331
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
332332
.satisfies(checkContains("ENTRYPOINT [ \"/opt/jboss/container/java/run/run-java.sh\" ]"));
333333
assertThat(projectDir.resolve("src/main/docker/Dockerfile.native-micro")).exists()
334334
.satisfies(checkContains("./mvnw package -Dnative"))
335-
.satisfies(checkContains("quay.io/quarkus/ubi9-quarkus-micro-image"))
335+
.satisfies(checkContains("quay.io/quarkus/quarkus-micro-image"))
336336
.satisfies(checkContains("ENTRYPOINT [\"./application\", \"-Dquarkus.http.host=0.0.0.0\"]"));
337337
assertThat(projectDir.resolve("src/main/docker/Dockerfile.native")).exists()
338338
.satisfies(checkContains("./mvnw package -Dnative"))
339-
.satisfies(checkContains("registry.access.redhat.com/ubi9/ubi-minimal"))
339+
.satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal"))
340340
.satisfies(checkContains("ENTRYPOINT [\"./application\", \"-Dquarkus.http.host=0.0.0.0\"]"));
341341
}
342342

@@ -345,24 +345,24 @@ private void checkDockerfilesWithGradle(Path projectDir) {
345345
assertThat(projectDir.resolve("src/main/docker/Dockerfile.jvm")).exists()
346346
.satisfies(checkContains("./gradlew build"))
347347
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.jvm"))
348-
.satisfies(checkContains("registry.access.redhat.com/ubi9/openjdk-17:"))
348+
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-17:"))
349349
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
350350
.satisfies(checkContains("ENTRYPOINT [ \"/opt/jboss/container/java/run/run-java.sh\" ]"));
351351
assertThat(projectDir.resolve("src/main/docker/Dockerfile.legacy-jar")).exists()
352352
.satisfies(checkContains("./gradlew build -Dquarkus.package.jar.type=legacy-jar"))
353353
.satisfies(checkContains("docker build -f src/main/docker/Dockerfile.legacy-jar"))
354-
.satisfies(checkContains("registry.access.redhat.com/ubi9/openjdk-17:"))
354+
.satisfies(checkContains("registry.access.redhat.com/ubi8/openjdk-17:"))
355355
.satisfies(checkContains("EXPOSE 8080"))
356356
.satisfies(checkContains("USER 185"))
357357
.satisfies(checkContains("ENV JAVA_APP_JAR=\"/deployments/quarkus-run.jar\""))
358358
.satisfies(checkContains("ENTRYPOINT [ \"/opt/jboss/container/java/run/run-java.sh\" ]"));
359359
assertThat(projectDir.resolve("src/main/docker/Dockerfile.native-micro")).exists()
360360
.satisfies(checkContains("./gradlew build -Dquarkus.native.enabled=true"))
361-
.satisfies(checkContains("quay.io/quarkus/ubi9-quarkus-micro-image:2.0"))
361+
.satisfies(checkContains("quay.io/quarkus/quarkus-micro-image:2.0"))
362362
.satisfies(checkContains("ENTRYPOINT [\"./application\", \"-Dquarkus.http.host=0.0.0.0\"]"));
363363
assertThat(projectDir.resolve("src/main/docker/Dockerfile.native")).exists()
364364
.satisfies(checkContains("./gradlew build -Dquarkus.native.enabled=true"))
365-
.satisfies(checkContains("registry.access.redhat.com/ubi9/ubi-minimal"))
365+
.satisfies(checkContains("registry.access.redhat.com/ubi8/ubi-minimal"))
366366
.satisfies(checkContains("ENTRYPOINT [\"./application\", \"-Dquarkus.http.host=0.0.0.0\"]"));
367367
}
368368

0 commit comments

Comments
 (0)