TEIID-4910 switching the build to a docker plugin

shawkins · Jun 7, 2017 · 8e3107a · 8e3107a
1 parent 9e9853d
commit 8e3107a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 84 deletions.
diff --git a/build/assembly/docker.xml b/build/assembly/docker.xml
diff --git a/build/kits/docker/Dockerfile → build/docker/Dockerfile b/build/kits/docker/Dockerfile → build/docker/Dockerfile
@@ -11,14 +11,14 @@ FROM jboss/base-jdk:8
 MAINTAINER Ramesh Reddy <rareddy@jboss.org>
 
 ENV WORKING_DIR /opt/jboss
-ENV JBOSS_EAP teiid-${project.version}
+ENV JBOSS_EAP teiid-@project.version@
 ENV JBOSS_HOME $WORKING_DIR/$JBOSS_EAP
 
 USER root
 
-COPY teiid-${project.version}-wildfly-server.zip $WORKING_DIR/teiid.zip
+COPY maven/ $WORKING_DIR
 
-RUN cd $WORKING_DIR && unzip -q teiid.zip && rm teiid.zip && chown -R jboss:jboss ${JBOSS_HOME}/ #\
+RUN cd $WORKING_DIR && chown -R jboss:jboss ${JBOSS_HOME}/ #\
 
 VOLUME ["$JBOSS_HOME/standalone", "$JBOSS_HOME/domain"]
 

diff --git a/build/kits/docker/build-image.sh b/build/kits/docker/build-image.sh
diff --git a/build/pom.xml b/build/pom.xml
@@ -15,6 +15,8 @@
       <dir.wildfly>wildfly-${version.org.wildfly}</dir.wildfly>
       <!-- Teiid server directory name. -->
       <dir.teiid>teiid-${project.version}</dir.teiid>
+      <!-- explicitly declare for docker plugin -->
+      <project.version>${project.version}</project.version>
   </properties>
 
     <build>
@@ -31,7 +33,6 @@
                     <include>**/*.bat</include>
                     <include>**/*.html</include>
                     <include>**/*.cli</include>
-                    <include>**/Dockerfile</include>
                 </includes>
             </resource>
             <resource>
@@ -44,7 +45,6 @@
                     <exclude>**/*.bat</exclude>
                     <exclude>**/*.html</exclude>
                     <exclude>**/*.cli</exclude>
-                    <exclude>**/Dockerfile</exclude>
                 </excludes>
             </resource>
         </resources>
@@ -119,7 +119,6 @@
                         <descriptor>assembly/wildfly-dist.xml</descriptor>
                         <descriptor>assembly/adminshell-dist.xml</descriptor>
                         <descriptor>assembly/wildfly-server.xml</descriptor>
-                        <descriptor>assembly/docker.xml</descriptor>
                     </descriptors>
                 </configuration>
                 <executions>
@@ -153,34 +152,28 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
-
+			</plugin>
+
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<configuration>
+					<images>
+						<image>
+							<name>teiid/teiid:${project.version}</name>
+							<alias>server</alias>
+							<build>
+							    <filter>@</filter>
+								<dockerFileDir>${project.basedir}/docker</dockerFileDir>
+								<assembly>
+                                    <descriptor>${project.basedir}/assembly/wildfly-server.xml</descriptor>
+                                </assembly>
+							</build>
+						</image>
+					</images>
+				</configuration>
+			</plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <!--
-            This profile is activated manually, as in "mvn ... -P release ..."
-            -->
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly/src.xml</descriptor>
-                                <descriptor>assembly/client-jar.xml</descriptor>
-                                <descriptor>assembly/wildfly-dist.xml</descriptor>
-                                <descriptor>assembly/adminshell-dist.xml</descriptor>
-                                <descriptor>assembly/wildfly-server.xml</descriptor>
-                                <descriptor>assembly/docker.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>    
 </project>