From 674912ebb7a52c8ed4c602818ddad881301871b2 Mon Sep 17 00:00:00 2001 From: BT2983 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 --- ms/neng/pom.xml | 64 ++++++++++++++++++++++++++++++++------ ms/neng/src/main/docker/Dockerfile | 4 +-- 2 files changed, 57 insertions(+), 11 deletions(-) (limited to 'ms') 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 @@ exec-maven-plugin org.codehaus.mojo + onap/ccsdk-apps-ms-neng @@ -393,7 +388,8 @@ ${project.version} - + + / @@ -410,11 +406,12 @@ + + - + + --> + + + com.spotify + docker-maven-plugin + 0.4.11 + + ${docker.registry}/org.onap.ccsdk.apps/${serviceArtifactName}:${project.version} + src/main/docker + docker-hub + https://${docker.registry} + + ${project.version} + latest + + true + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + / + ${project.build.directory} + opt/etc/config/* + + + / + ${project.build.directory} + opt/etc/keystore/* + + + / + ${project.build.directory} + opt/etc/truststore/* + + + / + ${project.build.directory} + opt/aai/keystore/* + + + / + ${project.build.directory} + etc/* + + + org.springframework.boot 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