From cd5d6025b12a0ff3e4fa76e1ee8b8ee290fbc2f3 Mon Sep 17 00:00:00 2001
From: jananib <janani.b@huawei.com>
Date: Thu, 30 Apr 2020 04:40:13 +0530
Subject: Docker file for NSSMF-ADAPTER

Bug fix

Change-Id: Ibf38c7603180227f85b770b3c030a4c941ea1771
Issue-ID: SO-2775
Signed-off-by: jananib <janani.b@huawei.com>
(cherry picked from commit 2dbccbebbeb910284a3a2477f185fc16b5e4da3d)
---
 packages/docker/pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'packages/docker/pom.xml')

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 3a9ec375da..4d60279ae8 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -251,6 +251,7 @@
             <image>
              <name>${docker.image.prefix}/nssmf-adapter</name>
               <build>
+<<<<<<< HEAD   (f360ba resolve problem CreateCommunicationService SST is null)
                <cleanup>try</cleanup>
                <dockerFile>docker-files/Dockerfile.so-app</dockerFile>
                <tags>
@@ -272,6 +273,29 @@
               </assembly>
              </build>
            </image>
+=======
+                <cleanup>try</cleanup>
+                <dockerFile>docker-files/Dockerfile.so-nssmf-adapter</dockerFile>
+                <tags>
+                  <tag>${project.version}</tag>
+                  <tag>${project.version}-${maven.build.timestamp}</tag>
+                  <tag>${project.docker.latesttag.version}</tag>
+                </tags>
+                <assembly>
+                  <inline>
+                    <dependencySets>
+                      <dependencySet>
+                        <includes>
+                          <include>org.onap.so.adapters:mso-nssmf-adapter</include>
+                        </includes>
+                        <outputFileNameMapping>app.jar</outputFileNameMapping>
+                      </dependencySet>
+                    </dependencySets>
+                  </inline>
+                </assembly>
+              </build>
+            </image>
+>>>>>>> CHANGE (2dbccb Docker file for NSSMF-ADAPTER)
             <image>
               <name>${docker.image.prefix}/so-appc-orchestrator</name>
               <build>
-- 
cgit 1.2.3-korg