[WIP wildfly-extras#98] Use docker-maven-plugin to generate images

jamesnetherton · Jun 15, 2015 · 9a1db30 · 9a1db30
1 parent 28451c9
commit 9a1db30
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 61 deletions.
diff --git a/docker/etc/context/Dockerfile b/docker/etc/context/Dockerfile
diff --git a/docker/pom.xml b/docker/pom.xml
@@ -36,6 +36,7 @@
 
     <!-- Properties -->
     <properties>
+        <docker.image.from>jboss/wildfly:${version.wildfly}</docker.image.from>
         <docker.image.name>wildflyext/wildfly-camel</docker.image.name>
         <docker.image.version>latest</docker.image.version>
     </properties>
@@ -54,42 +55,10 @@
     <!-- Build -->
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <finalName>docker</finalName>
-                            <descriptors>
-                                <descriptor>scripts/assembly-artifacts.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.jolokia</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>remove-images</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>remove</goal>
-                        </goals>
-                        <configuration>
-                            <images>
-                                <image>${docker.image.name}:${docker.image.version}</image>
-                                <image>${docker.image.name}:${project.version}</image>
-                            </images>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>build-docker-image</id>
                         <phase>install</phase>
@@ -101,12 +70,24 @@
                                 <image>
                                     <name>${docker.image.name}</name>
                                     <build>
+                                        <from>${docker.image.from}</from>
+                                        <cmd>
+                                            <shell>-c standalone-camel.xml -b 0.0.0.0 -bmanagement 0.0.0.0</shell>
+                                        </cmd>
+                                        <entryPoint>
+                                            <shell>/opt/jboss/wildfly/bin/entrypoint.sh</shell>
+                                        </entryPoint>
+                                        <ports>
+                                            <port>9999</port>
+                                        </ports>
                                         <tags>
                                             <tag>${docker.image.version}</tag>
                                             <tag>${project.version}</tag>
                                         </tags>
                                         <assembly>
-                                            <dockerFileDir>target/docker</dockerFileDir>
+                                            <basedir>/opt/jboss/wildfly</basedir>
+                                            <descriptor>${project.basedir}/scripts/assembly-artifacts.xml</descriptor>
+                                            <user>jboss:jboss:jboss</user>
                                         </assembly>
                                     </build>
                                 </image>

diff --git a/docker/scripts/assembly-artifacts.xml b/docker/scripts/assembly-artifacts.xml
@@ -29,10 +29,9 @@
 
     <fileSets>
         <fileSet>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>bin</outputDirectory>
             <directory>etc/context</directory>
             <includes>
-                <include>Dockerfile</include>
                 <include>entrypoint.sh</include>
             </includes>
             <filtered>true</filtered>
@@ -46,9 +45,8 @@
                 <include>org.wildfly.camel:wildfly-camel-patch:tar.gz</include>
             </includes>
             <scope>provided</scope>
-            <unpack>false</unpack>
+            <unpack>true</unpack>
         </dependencySet>
     </dependencySets>
-
 
 </assembly>
diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,7 @@
 
         <!-- Plugin versions -->
         <version-build-helper-plugin>1.9.1</version-build-helper-plugin>
-        <version-docker-maven-plugin>0.11.1</version-docker-maven-plugin>
+        <version-docker-maven-plugin>0.12.0</version-docker-maven-plugin>
         <version-groovy-maven-plugin>2.0</version-groovy-maven-plugin>
         <version-license-maven-plugin>1.8</version-license-maven-plugin>
         <version-maven-antrun-plugin>1.7</version-maven-antrun-plugin>