diff options
Diffstat (limited to 'packages/docker/pom.xml')
| -rw-r--r-- | packages/docker/pom.xml | 24 |
1 files changed, 24 insertions, 0 deletions
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> |