summaryrefslogtreecommitdiffstats
path: root/ms
diff options
context:
space:
mode:
authorDan Timoney <dt5972@att.com>2018-08-20 16:39:09 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-20 16:39:09 +0000
commit94521c797d7f7d903622f34f2a627c011b9c33bb (patch)
treef409c944dfd527fe08686389e81b24dc0b3b3f79 /ms
parent7e2a1e010afaa8c9b7419ac01fcd1f8e3a9af0e4 (diff)
parent674912ebb7a52c8ed4c602818ddad881301871b2 (diff)
Merge "Naming micro-service code."
Diffstat (limited to 'ms')
-rw-r--r--ms/neng/pom.xml64
-rw-r--r--ms/neng/src/main/docker/Dockerfile4
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