From 32d4ee96fa2657c0b44aea9359167a0aa0142c39 Mon Sep 17 00:00:00 2001
From: James Netherton <jnethert@redhat.com>
Date: Mon, 20 Jul 2015 10:16:44 +0100
Subject: [PATCH] [resolves #98] Use docker-maven-plugin to generate images

---
 docker/etc/context/Dockerfile         | 23 -------
 docker/pom.xml                        | 97 ++++++++++++++++-----------
 docker/scripts/assembly-artifacts.xml |  9 +--
 examples/camel-rest/pom.xml           | 28 +++-----
 4 files changed, 70 insertions(+), 87 deletions(-)
 delete mode 100644 docker/etc/context/Dockerfile

diff --git a/docker/etc/context/Dockerfile b/docker/etc/context/Dockerfile
deleted file mode 100644
index 998f40a643..0000000000
--- a/docker/etc/context/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-FROM wildflyext/wildfly:@version.wildfly@
-
-MAINTAINER Thomas Diesler <tdiesler@redhat.com>
-
-# Add the WildFly-Camel patch
-ADD wildfly-camel-patch-@project.version@.tar.gz /opt/jboss/wildfly
-
-# Add the docker entrypoint script
-ADD entrypoint.sh /opt/jboss/wildfly/bin/entrypoint.sh
-
-# Change the ownership of added files/dirs to `jboss`
-USER root
-RUN chown -R jboss.jboss /opt/jboss/wildfly
-RUN chmod +x /opt/jboss/wildfly/bin/entrypoint.sh
-USER jboss
-
-# Expose the native management port 
-EXPOSE 9999
-
-# Set default command line args for standalone mode
-ENTRYPOINT ["/opt/jboss/wildfly/bin/entrypoint.sh"]
-CMD ["-c", "standalone-camel.xml", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0"]
diff --git a/docker/pom.xml b/docker/pom.xml
index f3023ad52f..8cee83c0ed 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -37,7 +37,11 @@
     <!-- Properties -->
     <properties>
         <docker.image.name>wildflyext/wildfly-camel</docker.image.name>
+        <docker.image.from>wildflyext/wildfly:${version.wildfly}</docker.image.from>
+        <docker.image.maintainer>Thomas Diesler tdiesler@redhat.com</docker.image.maintainer>
         <docker.image.version>latest</docker.image.version>
+        <docker.removeAll>true</docker.removeAll>
+        <server.config>standalone-camel.xml</server.config>
     </properties>
 	
     <!-- Dependencies -->
@@ -55,58 +59,69 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
+                <groupId>org.jolokia</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
+                        <id>remove-images</id>
+                        <phase>clean</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>remove</goal>
                         </goals>
                         <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <finalName>docker</finalName>
-                            <descriptors>
-                                <descriptor>scripts/assembly-artifacts.xml</descriptor>
-                            </descriptors>
+                            <images>
+                                <image>
+                                    <name>${docker.image.name}:${docker.image.version}</name>
+                                </image>
+                                <image>
+                                    <name>${docker.image.name}:${project.version}</name>
+                                </image>
+                            </images>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
                     <execution>
-                        <phase>generate-resources</phase>
+                        <id>build-docker-image</id>
+                        <phase>install</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>build</goal>
                         </goals>
                         <configuration>
-                            <target>
-                                <exec executable="docker" failonerror="false">
-                                    <arg value="rmi" />
-                                    <arg value="--force=true" />
-                                    <arg value="${docker.image.name}:${docker.image.version}" />
-                                    <arg value="${docker.image.name}:${project.version}" />
-                                </exec>
-                                <exec executable="docker" error="target/build.err" failonerror="true">
-                                    <arg value="build" />
-                                    <arg value="--force-rm=true" />
-                                    <arg value="--rm=true" />
-                                    <arg value="-t" />
-                                    <arg value="${docker.image.name}:${docker.image.version}" />
-                                    <arg value="target/docker" />
-                                </exec>
-                                <exec executable="docker" error="target/tag.err" failonerror="true">
-                                    <arg value="tag" />
-                                    <arg value="${docker.image.name}:${docker.image.version}" />
-                                    <arg value="${docker.image.name}:${project.version}" />
-                                </exec>
-                                <echo>=========================================================================</echo>
-                                <echo>docker run --rm -ti -p 8080:8080 -p 9990:9990 -e WILDFLY_MANAGEMENT_USER=admin -e WILDFLY_MANAGEMENT_PASSWORD=admin ${docker.image.name}</echo>
-                                <echo>=========================================================================</echo>
-                            </target>
+                            <images>
+                                <image>
+                                    <name>${docker.image.name}</name>
+                                    <build>
+                                        <maintainer>${docker.image.maintainer}</maintainer>
+                                        <from>${docker.image.from}</from>
+                                        <cmd>
+                                            <exec>
+                                                <args>-c</args>
+                                                <args>${server.config}</args>
+                                                <args>-b</args>
+                                                <args>0.0.0.0</args>
+                                                <args>-bmanagement</args>
+                                                <args>0.0.0.0</args>
+                                            </exec>
+                                        </cmd>
+                                        <entryPoint>
+                                            <exec>
+                                                <args>/opt/jboss/wildfly/bin/entrypoint.sh</args>
+                                            </exec>
+                                        </entryPoint>
+                                        <ports>
+                                            <port>9999</port>
+                                        </ports>
+                                        <tags>
+                                            <tag>${docker.image.version}</tag>
+                                            <tag>${project.version}</tag>
+                                        </tags>
+                                        <assembly>
+                                            <basedir>/opt/jboss/wildfly</basedir>
+                                            <descriptor>${project.basedir}/scripts/assembly-artifacts.xml</descriptor>
+                                            <user>jboss:jboss:jboss</user>
+                                        </assembly>
+                                    </build>
+                                </image>
+                            </images>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/docker/scripts/assembly-artifacts.xml b/docker/scripts/assembly-artifacts.xml
index 36b539b1b1..fa4f358196 100644
--- a/docker/scripts/assembly-artifacts.xml
+++ b/docker/scripts/assembly-artifacts.xml
@@ -29,13 +29,11 @@
 
     <fileSets>
         <fileSet>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>bin</outputDirectory>
             <directory>etc/context</directory>
             <includes>
-                <include>Dockerfile</include>
                 <include>entrypoint.sh</include>
             </includes>
-            <filtered>true</filtered>
         </fileSet>
     </fileSets>
     
@@ -45,10 +43,9 @@
             <includes>
                 <include>org.wildfly.camel:wildfly-camel-patch:tar.gz</include>
             </includes>
+            <outputDirectory>.</outputDirectory>
             <scope>provided</scope>
-            <unpack>false</unpack>
+            <unpack>true</unpack>
         </dependencySet>
     </dependencySets>
-    
-
 </assembly>
diff --git a/examples/camel-rest/pom.xml b/examples/camel-rest/pom.xml
index 92898a3972..a5f0617d3c 100644
--- a/examples/camel-rest/pom.xml
+++ b/examples/camel-rest/pom.xml
@@ -37,6 +37,7 @@
     <!-- Properties -->
     <properties>
         <docker.image.name>wildflyext/${project.artifactId}</docker.image.name>
+        <docker.removeAll>true</docker.removeAll>
     </properties>
 
     <!-- Dependencies -->    
@@ -119,30 +120,23 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
+                        <groupId>org.jolokia</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <phase>install</phase>
+                                <id>remove-images</id>
+                                <phase>clean</phase>
                                 <goals>
-                                    <goal>run</goal>
+                                    <goal>remove</goal>
                                 </goals>
                                 <configuration>
-                                    <target>
-                                        <exec executable="docker" failonerror="false">
-                                            <arg value="rmi" />
-                                            <arg value="--force=true" />
-                                            <arg value="${docker.image.name}" />
-                                        </exec>
-                                    </target>
+                                    <images>
+                                        <image>
+                                            <name>${docker.image.name}</name>
+                                        </image>
+                                    </images>
                                 </configuration>
                             </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.jolokia</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <executions>
                             <execution>
                                 <id>build-docker-image</id>
                                 <phase>install</phase>