From 204fa286a5812275ecd629ff69fd03eb53ff6d78 Mon Sep 17 00:00:00 2001
From: Jimmy Forsyth <jf2512@att.com>
Date: Mon, 9 Sep 2019 16:06:34 -0400
Subject: [PATCH] Fix elalto docker build

Issue-ID: AAI-2579
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I0da2d9836d6f840a9bf183837613c88e9281ef7e
---
 champ-service/pom.xml | 92 +++++++++++++++++++++------------------------------
 1 file changed, 37 insertions(+), 55 deletions(-)

diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 03469b4..fdac175 100644
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -33,8 +33,6 @@ limitations under the License.
     <artifactId>champ-service</artifactId>
 
     <properties>
-        <docker.location>${basedir}/target</docker.location>
-        <docker.name>champ</docker.name>
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <common.logging.groupid>org.onap.aai.logging-service</common.logging.groupid>
         <common.logging.version>1.2.2</common.logging.version>
@@ -45,6 +43,18 @@ limitations under the License.
          <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in
          coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 -->
         <jacoco.line.coverage.limit>0.16</jacoco.line.coverage.limit>
+
+        <!-- docker related properties -->
+        <docker.image.name>champ</docker.image.name>
+        <docker.fabric.version>0.28.0</docker.fabric.version>
+        <aai.docker.version>1.0.0</aai.docker.version>
+        <aai.build.directory>${project.build.directory}/${project.artifactId}-build/
+        </aai.build.directory>
+        <aai.docker.namespace>onap</aai.docker.namespace>
+        <aai.base.image>alpine</aai.base.image>
+        <aai.base.image.version>1.6.0</aai.base.image.version>
+        <!-- This will be used for the docker images as the default format of maven build has issues -->
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
     <dependencyManagement>
@@ -123,15 +133,14 @@ limitations under the License.
             <version>3.22.0-GA</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jersey</artifactId>
             <exclusions>
-              <exclusion>
-               <groupId>org.springframework.boot</groupId>
-               <artifactId>spring-boot-starter-tomcat</artifactId>
-              </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -153,9 +162,9 @@ limitations under the License.
             <version>2.6.2</version>
         </dependency>
 
-         <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
@@ -279,44 +288,19 @@ limitations under the License.
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.7</version>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/descriptor.xml</descriptor>
+                    </descriptors>
+                </configuration>
                 <executions>
                     <execution>
-                        <id>copy-docker-file</id>
+                        <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>copy-resources</goal>
+                            <goal>single</goal>
                         </goals>
-                        <configuration>
-                            <outputDirectory>target</outputDirectory>
-                            <overwrite>true</overwrite>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}/src/main/docker</directory>
-                                    <filtering>true</filtering>
-                                    <includes>
-                                        <include>**/*</include>
-                                    </includes>
-                                </resource>
-                                <resource>
-                                    <directory>${basedir}/src/main/bin/</directory>
-                                </resource>
-                                <resource>
-                                    <directory>../champ-service-deps-janus/target/</directory>
-                                </resource>
-                                <resource>
-                                    <directory>../champ-service-deps-titan/target/</directory>
-                                </resource>
-                                <resource>
-                                    <directory>${basedir}</directory>
-                                    <includes>
-                                        <include>**/dynamic/**/*</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -344,7 +328,6 @@ limitations under the License.
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
@@ -354,9 +337,9 @@ limitations under the License.
                 <artifactId>maven-site-plugin</artifactId>
             </plugin>
         </plugins>
-      </build>
+    </build>
 
-      <profiles>
+    <profiles>
         <profile>
             <id>docker</id>
             <build>
@@ -387,16 +370,16 @@ limitations under the License.
                                 </goals>
                                 <configuration>
                                     <source>
-                                        def userAaiBaseImage = session.userProperties['aai.base.image'];
-                                        def userAaiCommonVersion = session.userProperties['aai.base.image.version'];
+                                        def userAaiBaseImage = session.userProperties['aai.base.image']
+                                        def userAaiCommonVersion = session.userProperties['aai.base.image.version']
                                         if (userAaiCommonVersion != null) {
-                                            project.properties['aai.base.image.version'] = userAaiCommonVersion;
+                                            project.properties['aai.base.image.version'] = userAaiCommonVersion
                                         }
                                         if (userAaiBaseImage != null) {
-                                            project.properties['aai.base.image'] = userAaiBaseImage;
+                                            project.properties['aai.base.image'] = userAaiBaseImage
                                         }
-                                        log.info 'Base image flavour: ' + project.properties['aai.base.image'];
-                                        log.info 'Base image version: ' + project.properties['aai.base.image.version'];
+                                        log.info 'Base image flavour: ' + project.properties['aai.base.image']
+                                        log.info 'Base image version: ' + project.properties['aai.base.image.version']
                                     </source>
                                 </configuration>
                             </execution>
@@ -411,7 +394,7 @@ limitations under the License.
                             <apiVersion>1.23</apiVersion>
                             <images>
                                 <image>
-                                    <name>${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l
+                                    <name>${docker.push.registry}/${aai.docker.namespace}/${docker.image.name}:%l
                                     </name>
                                     <build>
                                         <filter>@</filter>
@@ -466,6 +449,5 @@ limitations under the License.
                 </plugins>
             </build>
         </profile>
-      </profiles>
-      
+    </profiles>
 </project>
-- 
2.16.6