From 674912ebb7a52c8ed4c602818ddad881301871b2 Mon Sep 17 00:00:00 2001
From: BT2983 <BT2983@att.com>
Date: Mon, 20 Aug 2018 07:45:32 -0600
Subject: Naming micro-service code.

Using different docker plugin.

Change-Id: I2103d3058e9b3d1b95dac49790b244e21d77b39a
Issue-ID: CCSDK-342
Signed-off-by: BT2983 <BT2983@att.com>
---
 ms/neng/pom.xml                    | 64 ++++++++++++++++++++++++++++++++------
 ms/neng/src/main/docker/Dockerfile |  4 +--
 2 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index d3d4c05e..9cf6f33c 100644
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -371,18 +371,13 @@
                 <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
             </plugin>
+            <!--
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <inherited>false</inherited>
                 <configuration>
                     <verbose>false</verbose>
-<!--
-                    <authConfig>
-                        <username></username>
-                        <password></password>
-                    </authConfig>
--->
                     <images>
                         <image>
                             <name>onap/ccsdk-apps-ms-neng</name>
@@ -393,7 +388,8 @@
                                 <tags>
                                     <tag>${project.version}</tag>
                                 </tags>
-                                <assembly>
+
+                               <assembly>
                                     <targetDir>/</targetDir>
                                     <inline>
                                         <files>
@@ -410,11 +406,12 @@
                                         </fileSet>
                                     </inline>
                                 </assembly>
+
+
                             </build>
                         </image>
                     </images>
                 </configuration>
-<!--
                 <executions>
                     <execution>
                         <id>generate-images</id>
@@ -433,7 +430,56 @@
                         </goals>
                     </execution>
                 </executions>
--->
+            </plugin>
+            -->
+
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.4.11</version>
+                <configuration>
+                    <imageName>${docker.registry}/org.onap.ccsdk.apps/${serviceArtifactName}:${project.version}</imageName>
+                    <dockerDirectory>src/main/docker</dockerDirectory>
+                    <serverId>docker-hub</serverId>
+                    <registryUrl>https://${docker.registry}</registryUrl>
+                    <imageTags>
+                        <imageTag>${project.version}</imageTag>
+                        <imageTag>latest</imageTag>
+                    </imageTags>
+                    <forceTags>true</forceTags>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>opt/etc/config/*</include>
+                        </resource>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>opt/etc/keystore/*</include>
+                        </resource>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>opt/etc/truststore/*</include>
+                        </resource>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>opt/aai/keystore/*</include>
+                        </resource>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>etc/*</include>
+                        </resource>
+                    </resources>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/ms/neng/src/main/docker/Dockerfile b/ms/neng/src/main/docker/Dockerfile
index bcdaaef2..dd239ebc 100644
--- a/ms/neng/src/main/docker/Dockerfile
+++ b/ms/neng/src/main/docker/Dockerfile
@@ -21,10 +21,10 @@
 #================================================================================
 FROM onap/ccsdk-ubuntu-image:latest
 VOLUME /tmp
-ADD maven/NetworkElementNameGen.jar app.jar
+ADD NetworkElementNameGen.jar app.jar
 VOLUME /opt/etc
 #VOLUME /opt/aai
-ADD maven/opt/etc/ /opt/etc/
+ADD opt/etc/ /opt/etc/
 #ADD /opt/aai/ /opt/aai/
 ADD startService.sh /startService.sh
 RUN chmod 700 /startService.sh
-- 
cgit 1.2.3-korg