Generate docker files for quickstart and database (#4581)

Signed-off-by: tvallin <[email protected]>
helidon-io · Jul 21, 2022 · 18d6a45 · 18d6a45
1 parent 2594808
commit 18d6a45
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 64 deletions.
diff --git a/archetypes/helidon/src/main/archetype/common/presets.xml b/archetypes/helidon/src/main/archetype/common/presets.xml
@@ -32,9 +32,9 @@
         <boolean path="tracing">false</boolean>
         <list path="extra"/>
         <boolean path="security">false</boolean>
-        <boolean path="docker">false</boolean>
-        <boolean path="docker.native-image">false</boolean>
-        <boolean path="docker.jlink-image">false</boolean>
+        <boolean path="docker">true</boolean>
+        <boolean path="docker.native-image">true</boolean>
+        <boolean path="docker.jlink-image">true</boolean>
         <boolean path="k8s">false</boolean>
         <boolean path="v8o">false</boolean>
     </presets>

diff --git a/archetypes/helidon/src/main/archetype/mp/database/database-mp.xml b/archetypes/helidon/src/main/archetype/mp/database/database-mp.xml
@@ -29,11 +29,6 @@
         <model>
             <value key="title">Helidon MP Database</value>
             <value key="readme-description">Helidon MP application that uses JPA with an in-memory H2 database.</value>
-            <list key="native-sections" if="${docker}">
-                <value file="files/README.native.md"
-                       if="${docker.native-image} &amp;&amp; ${db.server} != 'mongodb'"
-                       template="mustache"/>
-            </list>
             <list key="readme-exercise-the-application">
                 <value file="files/README.md"/>
             </list>

diff --git a/archetypes/helidon/src/main/archetype/mp/quickstart/files/README.native.md b/archetypes/helidon/src/main/archetype/mp/quickstart/files/README.native.md
diff --git a/archetypes/helidon/src/main/archetype/mp/quickstart/quickstart-mp.xml b/archetypes/helidon/src/main/archetype/mp/quickstart/quickstart-mp.xml
@@ -38,9 +38,6 @@
             <list key="readme-exercise-the-application">
                 <value file="files/README.md"/>
             </list>
-            <list key="readme-sections" if="${docker}">
-                <value file="files/README.native.md" if="${docker.native-image}" template="mustache"/>
-            </list>
             <list key="MainTest-java-imports">
                 <value>jakarta.ws.rs.client.Entity</value>
                 <value>jakarta.ws.rs.core.MediaType</value>

diff --git a/archetypes/helidon/src/main/archetype/se/custom/custom-se.xml b/archetypes/helidon/src/main/archetype/se/custom/custom-se.xml
@@ -46,7 +46,7 @@
             <list key="Main-routingBuilder">
                 <value><![CDATA[                .register("/simple-greet", simpleGreetService)]]></value>
             </list>
-            <value key="Main-readyMessage">System.out.println("WEB server is up! http://localhost:" + ws.port() + "/simple-greet");</value>
+            <value key="Main-readyMessage" if="${app-type} != 'quickstart'">System.out.println("WEB server is up! http://localhost:" + ws.port() + "/simple-greet");</value>
             <list key="config-entries">
                 <value file="files/src/main/resources/application.config.yaml"/>
             </list>

diff --git a/archetypes/helidon/src/main/archetype/se/database/database-se.xml b/archetypes/helidon/src/main/archetype/se/database/database-se.xml
@@ -31,11 +31,6 @@
             <list key="readme-exercise-the-application">
                 <value file="files/README.md" template="mustache"/>
             </list>
-            <list key="readme-sections" if="${docker} &amp;&amp; ${db}">
-                <value file="files/README.native.md"
-                       if="${docker.native-image} &amp;&amp; ${db.server} != 'mongodb'"
-                       template="mustache"/>
-            </list>
         </model>
     </output>
 </archetype-script>
diff --git a/archetypes/helidon/src/main/archetype/se/quickstart/files/README.native.md b/archetypes/helidon/src/main/archetype/se/quickstart/files/README.native.md
diff --git a/archetypes/helidon/src/main/archetype/se/quickstart/quickstart-se.xml b/archetypes/helidon/src/main/archetype/se/quickstart/quickstart-se.xml
@@ -33,15 +33,13 @@
             <list key="readme-exercise-the-application">
                 <value file="files/README.md"/>
             </list>
-            <list key="readme-sections" if="${docker}">
-                <value file="files/README.native.md" if="${docker.native-image}" template="mustache"/>
-            </list>
             <list key="Main-createRouting">
                 <value><![CDATA[        GreetService greetService = new GreetService(config);]]></value>
             </list>
             <list key="Main-routingBuilder">
                 <value><![CDATA[                .register("/greet", greetService)]]></value>
             </list>
+            <value key="Main-readyMessage">System.out.println("WEB server is up! http://localhost:" + ws.port() + "/greet");</value>
         </model>
     </output>
 </archetype-script>