Codestart modularize Dockerfiles #42601

vsevel · 2024-08-16T17:43:37Z

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 · 2024-08-19T12:29:45Z

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 · 2024-08-19T20:32:49Z

wonder how it relates to #42316

ia3andy · 2024-08-20T07:43:56Z

@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.

...esources/codestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm

vsevel · 2024-09-10T12:24:28Z

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

quarkus-bot · 2024-09-10T17:24:24Z

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.

vsevel · 2024-10-31T08:45:25Z

@maxandersen and @ia3andy what should we do?
I am ok if we close it as not planned, unless you see some value in this refactoring.

vsevel · 2024-10-31T10:08:20Z

after discussion, does not seem to bring enough value as this time,

quarkus-bot bot added area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/platform Issues related to definition and interaction with Quarkus Platform labels Aug 16, 2024

vsevel force-pushed the feature/codestart_modularize_dockerfiles_bis branch 3 times, most recently from 2e68c6f to a66b3b7 Compare August 16, 2024 17:50

vsevel requested review from gsmet and ia3andy August 16, 2024 17:52

ia3andy requested changes Aug 16, 2024

View reviewed changes

ia3andy approved these changes Aug 19, 2024

View reviewed changes

quarkus-bot bot added the area/codestarts label Aug 19, 2024

vsevel force-pushed the feature/codestart_modularize_dockerfiles_bis branch from 2769139 to 86b193e Compare August 19, 2024 11:51

quarkus-bot bot added area/security area/testing labels Aug 19, 2024

vsevel force-pushed the feature/codestart_modularize_dockerfiles_bis branch from 86b193e to a500337 Compare August 19, 2024 11:54

vsevel mentioned this pull request Aug 19, 2024

Codestart modularize Dockerfiles #42589

Closed

vsevel changed the title ~~Codestart modularize dockerfiles bis~~ Codestart modularize Dockerfiles Aug 19, 2024

vsevel force-pushed the feature/codestart_modularize_dockerfiles_bis branch 2 times, most recently from 2dd738d to 14bcb6f Compare August 19, 2024 12:04

vsevel marked this pull request as ready for review August 19, 2024 12:29

ia3andy approved these changes Aug 19, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

gsmet reviewed Aug 28, 2024

View reviewed changes

...esources/codestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm Outdated Show resolved Hide resolved

vsevel force-pushed the feature/codestart_modularize_dockerfiles_bis branch 2 times, most recently from 56f1344 to 3cc866a Compare September 10, 2024 12:14

Codestart modularize Dockerfiles

411f65e

vsevel force-pushed the feature/codestart_modularize_dockerfiles_bis branch from 3cc866a to 411f65e Compare September 10, 2024 12:21

quarkus-bot bot added the triage/flaky-test label Sep 10, 2024

maxandersen reviewed Sep 10, 2024

View reviewed changes

vsevel mentioned this pull request Sep 12, 2024

Merge extension catalog metadata properties when merging catalogs from different registries #43236

Closed

vsevel closed this Oct 31, 2024

quarkus-bot bot added the triage/invalid This doesn't seem right label Oct 31, 2024

vsevel deleted the feature/codestart_modularize_dockerfiles_bis branch October 31, 2024 10:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Codestart modularize Dockerfiles #42601

Codestart modularize Dockerfiles #42601

vsevel commented Aug 16, 2024

ia3andy left a comment

ia3andy left a comment

vsevel commented Aug 19, 2024

ia3andy left a comment

This comment has been minimized.

maxandersen commented Aug 19, 2024

This comment has been minimized.

ia3andy commented Aug 20, 2024

gsmet left a comment

vsevel commented Sep 10, 2024 •

edited

Loading

quarkus-bot bot commented Sep 10, 2024 •

edited by github-actions bot

Loading

maxandersen left a comment

vsevel commented Oct 31, 2024

vsevel commented Oct 31, 2024

Codestart modularize Dockerfiles #42601

Codestart modularize Dockerfiles #42601

Conversation

vsevel commented Aug 16, 2024

ia3andy left a comment

Choose a reason for hiding this comment

ia3andy left a comment

Choose a reason for hiding this comment

vsevel commented Aug 19, 2024

ia3andy left a comment

Choose a reason for hiding this comment

This comment has been minimized.

maxandersen commented Aug 19, 2024

This comment has been minimized.

ia3andy commented Aug 20, 2024

gsmet left a comment

Choose a reason for hiding this comment

vsevel commented Sep 10, 2024 • edited Loading

quarkus-bot bot commented Sep 10, 2024 • edited by github-actions bot Loading

Status for workflow Quarkus CI

Failing Jobs

Failures

⚙️ JVM Tests - JDK 17 #

📦 independent-projects/tools/devtools-testing

⚙️ JVM Tests - JDK 21 #

📦 independent-projects/tools/devtools-testing

⚙️ JVM Tests - JDK 17 Windows #

📦 independent-projects/tools/devtools-testing

Flaky tests - Develocity

⚙️ Native Tests - HTTP

📦 integration-tests/rest-client-reactive

maxandersen left a comment

Choose a reason for hiding this comment

vsevel commented Oct 31, 2024

vsevel commented Oct 31, 2024

vsevel commented Sep 10, 2024 •

edited

Loading

quarkus-bot bot commented Sep 10, 2024 •

edited by github-actions bot

Loading

Status for workflow `Quarkus CI`