support -Dnative.image.skip and -Dnative.image.buildStatic (helidon-i…

…o#6438) * Update application parent poms to support -Dnative.image.skip and -Dnative.image.buildStatic This makes the Dockerfiles backward compatible. Fixes helidon-io#6307 Fixes helidon-io#6283 * Move native goals out of pluginManagement as they get included with any declaration of the native-image plugin.
barchetta · Mar 21, 2023 · e42f565 · e42f565
1 parent 7fce9f8
commit e42f565
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 22 deletions.
diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
@@ -92,14 +92,12 @@
                                 <goals>
                                     <goal>generateResourceConfig</goal>
                                 </goals>
-                                <phase>package</phase>
                             </execution>
                             <execution>
                                 <id>build-native-image</id>
                                 <goals>
                                     <goal>compile</goal>
                                 </goals>
-                                <phase>package</phase>
                             </execution>
                         </executions>
                     </plugin>

diff --git a/applications/parent/pom.xml b/applications/parent/pom.xml
@@ -179,13 +179,15 @@
                     <executions>
                         <execution>
                             <id>resource-config</id>
+                            <phase>package</phase>
                             <configuration>
                                 <!-- generate records for all module's resources -->
                                 <isDetectionEnabled>true</isDetectionEnabled>
                             </configuration>
                         </execution>
                         <execution>
                             <id>build-native-image</id>
+                            <phase>package</phase>
                             <configuration>
                                 <!-- generate an argument file for native image - great for troubleshooting -->
                                 <useArgFile>true</useArgFile>
@@ -210,11 +212,37 @@
     </build>
     <profiles>
         <profile>
-            <id>linux-native</id>
+            <id>native-image-skip</id>
             <activation>
-                <os>
-                    <family>Linux</family>
-                </os>
+                <property>
+                    <name>native.image.skip</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>resource-config</id>
+                                <phase>none</phase>
+                            </execution>
+                            <execution>
+                                <id>build-native-image</id>
+                                <phase>none</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>native-image-static</id>
+            <activation>
+                <property>
+                    <name>native.image.buildStatic</name>
+                </property>
             </activation>
             <build>
                 <plugins>

diff --git a/applications/se/pom.xml b/applications/se/pom.xml
@@ -45,14 +45,12 @@
                                 <goals>
                                     <goal>generateResourceConfig</goal>
                                 </goals>
-                                <phase>package</phase>
                             </execution>
                             <execution>
                                 <id>build-native-image</id>
                                 <goals>
                                     <goal>compile</goal>
                                 </goals>
-                                <phase>package</phase>
                             </execution>
                         </executions>
                     </plugin>

diff --git a/archetypes/helidon/src/main/archetype/common/files/Dockerfile.native.mustache b/archetypes/helidon/src/main/archetype/common/files/Dockerfile.native.mustache
@@ -21,12 +21,12 @@ WORKDIR /helidon
 # Incremental docker builds will always resume after that, unless you update
 # the pom
 ADD pom.xml .
-RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
 
 # Do the Maven build!
 # Incremental docker builds will resume here when you change sources
 ADD src src
-RUN mvn package -Pnative-image -DskipTests
+RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests
 
 RUN echo "done!"
 

diff --git a/examples/integrations/neo4j/neo4j-mp/Dockerfile.native b/examples/integrations/neo4j/neo4j-mp/Dockerfile.native
@@ -36,12 +36,12 @@ WORKDIR /helidon
 # Incremental docker builds will always resume after that, unless you update
 # the pom
 ADD pom.xml .
-RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
 
 # Do the Maven build!
 # Incremental docker builds will resume here when you change sources
 ADD src src
-RUN mvn package -Pnative-image -DskipTests
+RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests
 
 RUN echo "done!"
 

diff --git a/examples/integrations/neo4j/neo4j-se/Dockerfile.native b/examples/integrations/neo4j/neo4j-se/Dockerfile.native
@@ -36,12 +36,12 @@ WORKDIR /helidon
 # Incremental docker builds will always resume after that, unless you update
 # the pom
 ADD pom.xml .
-RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
 
 # Do the Maven build!
 # Incremental docker builds will resume here when you change sources
 ADD src src
-RUN mvn package -Pnative-image -DskipTests
+RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests
 
 RUN echo "done!"
 

diff --git a/examples/quickstarts/helidon-quickstart-mp/Dockerfile.native b/examples/quickstarts/helidon-quickstart-mp/Dockerfile.native
@@ -36,12 +36,12 @@ WORKDIR /helidon
 # Incremental docker builds will always resume after that, unless you update
 # the pom
 ADD pom.xml .
-RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
 
 # Do the Maven build!
 # Incremental docker builds will resume here when you change sources
 ADD src src
-RUN mvn package -Pnative-image -DskipTests
+RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests
 
 RUN echo "done!"
 

diff --git a/examples/quickstarts/helidon-quickstart-se/Dockerfile.native b/examples/quickstarts/helidon-quickstart-se/Dockerfile.native
@@ -36,12 +36,12 @@ WORKDIR /helidon
 # Incremental docker builds will always resume after that, unless you update
 # the pom
 ADD pom.xml .
-RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
 
 # Do the Maven build!
 # Incremental docker builds will resume here when you change sources
 ADD src src
-RUN mvn package -Pnative-image -DskipTests
+RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests
 
 RUN echo "done!"
 

diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.native b/examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.native
@@ -36,12 +36,12 @@ WORKDIR /helidon
 # Incremental docker builds will always resume after that, unless you update
 # the pom
 ADD pom.xml .
-RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
 
 # Do the Maven build!
 # Incremental docker builds will resume here when you change sources
 ADD src src
-RUN mvn package -Pnative-image -DskipTests
+RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests
 
 RUN echo "done!"
 

diff --git a/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.native b/examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.native
@@ -36,12 +36,12 @@ WORKDIR /helidon
 # Incremental docker builds will always resume after that, unless you update
 # the pom
 ADD pom.xml .
-RUN mvn package -Dmaven.test.skip -Declipselink.weave.skip
+RUN mvn package -Pnative-image -Dnative.image.skip -Dmaven.test.skip -Declipselink.weave.skip
 
 # Do the Maven build!
 # Incremental docker builds will resume here when you change sources
 ADD src src
-RUN mvn package -Pnative-image -DskipTests
+RUN mvn package -Pnative-image -Dnative.image.buildStatic -DskipTests
 
 RUN echo "done!"