Port build configuration and standardization changes from mad. (#81)

Author: vjkoskela

pom.xml

@@ -176,6 +176,15 @@
     <!-- JVM Debug -->
     <debugJavaOptions />
     <debugJavaPort>9000</debugJavaPort>
+
+    <!-- Docker Overrides -->
+    <skipDockerBuild>false</skipDockerBuild>
+
+    <!-- Assembly Overrides -->
+    <tgz.finalName>${project.build.finalName}</tgz.finalName>
+
+    <!-- Project Overrides -->
+    <buildDirectory>${project.basedir}/target</buildDirectory>
   </properties>
 
   <build>
@@ -265,6 +274,7 @@
               <mainClass>com.arpnetworking.clusteraggregator.Main</mainClass>
             </program>
           </programs>
+          <unixScriptTemplate>${project.build.directory}/appAssemblerUnixBinTemplate</unixScriptTemplate>
           <endorsedDir>lib/ext</endorsedDir>
         </configuration>
       </plugin>
@@ -314,6 +324,7 @@
               <goal>single</goal>
             </goals>
             <configuration>
+              <finalName>${tgz.finalName}</finalName>
               <appendAssemblyId>true</appendAssemblyId>
               <attach>false</attach>
               <tarLongFileMode>posix</tarLongFileMode>
@@ -475,6 +486,7 @@
               </run>
             </image>
           </images>
+          <skip>${skipDockerBuild}</skip>
         </configuration>
       </plugin>
     </plugins>
@@ -891,7 +903,7 @@
                   <directory>/opt/cluster-aggregator</directory>
                   <sources>
                     <source>
-                      <location>target/appassembler</location>
+                      <location>${buildDirectory}/appassembler</location>
                     </source>
                   </sources>
                 </mapping>
@@ -939,5 +951,15 @@
         <debugJavaOptions>-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=${debugJavaPort},suspend=n</debugJavaOptions>
       </properties>
     </profile>
+    <profile>
+      <id>no-docker</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <skipIntegrationTests>true</skipIntegrationTests>
+        <skipDockerBuild>true</skipDockerBuild>
+      </properties>
+    </profile>
   </profiles>
 </project>

src/main/assembly/bin.xml

@@ -30,15 +30,15 @@
             <fileMode>0644</fileMode>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/target/appassembler/bin</directory>
+            <directory>${buildDirectory}/appassembler/bin</directory>
             <outputDirectory>bin</outputDirectory>
             <fileMode>0755</fileMode>
             <includes>
                 <include>cluster-aggregator</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/target/appassembler/lib</directory>
+            <directory>${buildDirectory}/appassembler/lib</directory>
             <outputDirectory>lib</outputDirectory>
             <fileMode>0644</fileMode>
         </fileSet>

src/main/assembly/docker.xml

@@ -39,23 +39,23 @@
       <fileMode>0644</fileMode>
     </fileSet>
     <fileSet>
-      <directory>${project.basedir}/target/appassembler/bin</directory>
+      <directory>${buildDirectory}/appassembler/bin</directory>
       <outputDirectory>bin</outputDirectory>
       <fileMode>0755</fileMode>
        <includes>
         <include>cluster-aggregator</include>
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.basedir}/target/appassembler/lib</directory>
+      <directory>${buildDirectory}/appassembler/lib</directory>
       <outputDirectory>lib</outputDirectory>
       <fileMode>0644</fileMode>
       <includes>
         <include>${artifactId}-${artifact.version}.jar</include>
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.basedir}/target/appassembler/lib</directory>
+      <directory>${buildDirectory}/appassembler/lib</directory>
       <outputDirectory>deps</outputDirectory>
       <fileMode>0644</fileMode>
       <excludes>

src/main/docker/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM openjdk:8u131-jre-alpine
+FROM openjdk:8u151-jre-alpine
 
 MAINTAINER arpnetworking
 
@@ -24,9 +24,8 @@ WORKDIR /opt/cluster-aggregator
 ENV JVM_XMS="64m"
 ENV JVM_XMX="1024m"
 ENV LOGBACK_CONFIG="-Dlogback.configurationFile=/opt/cluster-aggregator/config/logback.xml"
-ENV APP_PARAMS="/opt/cluster-aggregator/config/config.conf"
-ENV ADDITIONAL_APP_PARAMS=""
-ENV ADDITIONAL_JAVA_OPTS=""
+ENV CAGG_CONFIG="/opt/cluster-aggregator/config/config.conf"
+ENV JAVA_OPTS=""
 
 # Build
 RUN apk -U add libstdc++ && \
@@ -39,19 +38,21 @@ ADD config /opt/cluster-aggregator/config/
 ADD lib /opt/cluster-aggregator/lib/
 
 # Entry point
-CMD JAVA_OPTS="${LOGBACK_CONFIG} \
-    -XX:+HeapDumpOnOutOfMemoryError \
-    -XX:HeapDumpPath=/opt/cluster-aggregator/logs/cluster-aggregator.oom.hprof \
-    -XX:+PrintGCDetails \
-    -XX:+PrintGCDateStamps \
-    -Xloggc:logs/cluster-aggregator.gc.log \
-    -XX:NumberOfGCLogFiles=2 \
-    -XX:GCLogFileSize=50M \
-    -XX:+UseGCLogFileRotation \
-    -Xms${JVM_XMS} \
-    -Xmx${JVM_XMX} \
-    -XX:+UseStringDeduplication \
-    -XX:+UseG1GC \
-    -Duser.timezone=UTC \
-    ${ADDITIONAL_JAVA_OPTS}" \
-    /opt/cluster-aggregator/bin/cluster-aggregator ${APP_PARAMS} ${ADDITIONAL_APP_PARAMS}
+ENTRYPOINT [ \
+    "/opt/cluster-aggregator/bin/cluster-aggregator", \
+    "${LOGBACK_CONFIG}", \
+    "-XX:+HeapDumpOnOutOfMemoryError", \
+    "-XX:HeapDumpPath=/opt/cluster-aggregator/logs/cluster-aggregator.oom.hprof", \
+    "-XX:+PrintGCDetails", \
+    "-XX:+PrintGCDateStamps", \
+    "-Xloggc:/opt/cluster-aggregator/logs/cluster-aggregator.gc.log", \
+    "-XX:NumberOfGCLogFiles=2", \
+    "-XX:GCLogFileSize=50M", \
+    "-XX:+UseGCLogFileRotation", \
+    "-Xms${JVM_XMS}", \
+    "-Xmx${JVM_XMX}", \
+    "-XX:+UseStringDeduplication", \
+    "-XX:+UseG1GC", \
+    "-Duser.timezone=UTC", \
+    "--", \
+    "${CAGG_CONFIG}" ]