Codestart modularize Dockerfiles

[vsevel]

This is an alternate proposition for #42589

there are 2 main include, which provide an overall view for docker files:

• Dockerfile-jar.include.qute
• Dockerfile-native.include.qute

each one includes a FROM include, which will allow for easy override:

• Dockerfile-jar-from.include.qute
• Dockerfile-native-from.include.qute

all 4 templates Dockerfile.tpl.qute... merely include one of the 2 main include.

[ia3andy]

You should be able to have only one include file for all types (native and non native), just use a Let https://quarkus.io/guides/qute-reference#let_section to set the value for jvm

[ia3andy]

Neat @vsevel

[vsevel]

the original intent was to allow overriding the FROM by redefining the template. but we reverted that.
instead we simplified the templates by providing just 2 include templates that are used from all 4 templates (jvm, legacy, ...).

[ia3andy]

Perfect!

[maxandersen]

wonder how it relates to #42316

[ia3andy]

@gsmet waiting for your final word on this one too to merge it

[gsmet]

Sorry for the delay. I like this approach a lot better, thanks.

There's only one thing that is bothering me a bit. Could you adjust? Then I think we can merge.

And we will have to discuss what you achieve here with the work of @iocanel on the dynamic generation of templates.

[vsevel]

I made the change and rebased. I think we are good @gsmet .

[quarkus-bot]

Status for workflow Quarkus CI

This is the status report for running Quarkus CI on commit 411f65e.

Failing Jobs

Status	Name	Step	Failures	Logs	Raw logs	Build scan
✖	JVM Tests - JDK 17	Build	Failures	Logs	Raw logs	🔍
✖	JVM Tests - JDK 21	Build	Failures	Logs	Raw logs	🔍
✖	JVM Tests - JDK 17 Windows	Build	Failures	Logs	Raw logs	🔍

Full information is available in the Build summary check run.
You can consult the Develocity build scans.

Failures

⚙️ JVM Tests - JDK 17 #

- Failing: independent-projects/tools/devtools-testing 
! Skipped: devtools/cli devtools/gradle/gradle-application-plugin devtools/gradle/gradle-extension-plugin and 7 more

📦 independent-projects/tools/devtools-testing

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateGradleDefaultJava(TestInfo) line 210 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateMavenConfigYamlJava(TestInfo) line 248 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateMavenDefaultJava(TestInfo) line 191 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateMavenResteasyJava(TestInfo) line 229 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateRESTEasyJavaCustom(TestInfo) line 82 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateRESTEasyKotlinCustom(TestInfo) line 130 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateRESTEasyScalaCustom(TestInfo) line 163 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

---

⚙️ JVM Tests - JDK 21 #

- Failing: independent-projects/tools/devtools-testing 
! Skipped: devtools/cli devtools/gradle/gradle-application-plugin devtools/gradle/gradle-extension-plugin and 7 more

📦 independent-projects/tools/devtools-testing

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateGradleDefaultJava(TestInfo) line 210 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateMavenConfigYamlJava(TestInfo) line 248 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateMavenDefaultJava(TestInfo) line 191 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateMavenResteasyJava(TestInfo) line 229 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateRESTEasyJavaCustom(TestInfo) line 82 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateRESTEasyKotlinCustom(TestInfo) line 130 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateRESTEasyScalaCustom(TestInfo) line 163 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

---

⚙️ JVM Tests - JDK 17 Windows #

- Failing: independent-projects/tools/devtools-testing 
! Skipped: devtools/cli devtools/gradle/gradle-application-plugin devtools/gradle/gradle-extension-plugin and 7 more

📦 independent-projects/tools/devtools-testing

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateGradleDefaultJava(TestInfo) line 210 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateMavenConfigYamlJava(TestInfo) line 248 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateMavenDefaultJava(TestInfo) line 191 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateMavenResteasyJava(TestInfo) line 229 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateRESTEasyJavaCustom(TestInfo) line 82 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateRESTEasyKotlinCustom(TestInfo) line 130 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartGenerationTest.generateRESTEasyScalaCustom(TestInfo) line 163 - History - More details - Source on GitHub

org.assertj.core.error.AssertJMultipleFailuresError: 

Multiple Failures (1 failure)
-- failure 1 --
Expecting actual:
  "####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#

---

Flaky tests - Develocity

⚙️ Native Tests - HTTP

📦 integration-tests/rest-client-reactive

✖ io.quarkus.it.rest.client.BasicTestIT.shouldCreateClientSpans - History

• expected: <1> but was: <2> - org.opentest4j.AssertionFailedError

org.opentest4j.AssertionFailedError: expected: <1> but was: <2>
	at io.quarkus.it.rest.client.BasicTest.shouldCreateClientSpans(BasicTest.java:216)
	at java.base/java.lang.reflect.Method.invoke(Method.java:569)
	at io.quarkus.test.junit.QuarkusTestExtension.interceptTestMethod(QuarkusTestExtension.java:810)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)

[maxandersen]

Yeah. Well want to figure how this relates to the regeneration work before we merge it.

I think it can be aligned but as it is now we would end up with two approaches that are related but having duplicated maintanence and different level of customization.