[resolves wildfly-extras#2711] Unable to build image wildflyext/wildf…

…ly-camel
jamesnetherton · Nov 28, 2018 · 7ff1697 · 7ff1697
1 parent db68026
commit 7ff1697
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 19 deletions.
diff --git a/docker/pom.xml b/docker/pom.xml
@@ -59,6 +59,31 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-distro</id>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wildfly.camel</groupId>
+                                    <artifactId>wildfly-camel-patch</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>tar.gz</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <excludes>**/standalone/configuration/**</excludes>
+                            <outputDirectory>${project.build.directory}/${server.home}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
@@ -122,7 +147,7 @@
                     </execution>
                     <execution>
                         <id>build-docker-image</id>
-                        <phase>install</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>build</goal>
                         </goals>

diff --git a/docker/s2i/assembly-artifacts.xml b/docker/s2i/assembly-artifacts.xml
@@ -27,31 +27,18 @@
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
 
-    <dependencySets>
-        <dependencySet>
-            <useStrictFiltering>true</useStrictFiltering>
-            <includes>
-                <include>org.wildfly.camel:wildfly-camel-patch:tar.gz</include>
-            </includes>
-            <outputDirectory>${server.home}</outputDirectory>
-            <scope>provided</scope>
-            <unpack>true</unpack>
-            <unpackOptions>
-                <excludes>
-                    <exclude>standalone/configuration/*</exclude>
-                </excludes>
-            </unpackOptions>
-        </dependencySet>
-    </dependencySets>
-
     <fileSets>
         <fileSet>
-            <outputDirectory>usr/libexec/s2i</outputDirectory>
             <directory>s2i/bin</directory>
+            <outputDirectory>usr/libexec/s2i</outputDirectory>
             <includes>
                 <include>run</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/${server.home}</directory>
+            <outputDirectory>${server.home}</outputDirectory>
+        </fileSet>
     </fileSets>
 
 </assembly>
diff --git a/pom.xml b/pom.xml
@@ -398,6 +398,7 @@
                         <goals>
                             <goal>enforce</goal>
                         </goals>
+                        <phase>initialize</phase>
                         <configuration>
                             <rules>
                                 <requireJavaVersion>