PNF WF post instantiation configuration

[so.git] / packages / docker / pom.xml

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 41495cc..6cef920 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.onap.so</groupId>
                <artifactId>packages</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
 
        <packaging>pom</packaging>
@@ -23,6 +23,8 @@
                <docker.skip.push>false</docker.skip.push>
                <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
                <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+               <docker.image.prefix>onap/so</docker.image.prefix>
+               <docker.push.phase>deploy</docker.push.phase>
        </properties>
 
        <build>
@@ -72,7 +74,7 @@
 
                                        <images>
                                                <image>
-                                                       <name>so/base-image:1.0</name>
+                                                       <name>${docker.image.prefix}/base-image:1.0</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -80,7 +82,32 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/catalog-db-adapter</name>
+                                                       <name>${docker.image.prefix}/vnfm-adapter</name>
+                                                       <build>
+                                                               <cleanup>try</cleanup>
+                                                               <dockerFileDir>docker-files</dockerFileDir>
+                                                               <dockerFile>Dockerfile.so-app</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-vnfm-etsi-adapter</include>
+                                                                                               </includes>
+                                                                                               <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                                                       </dependencySet>
+                                                                               </dependencySets>
+                                                                       </inline>
+                                                               </assembly>
+                                                       </build>
+                                               </image>
+                                               <image>
+                                                       <name>${docker.image.prefix}/catalog-db-adapter</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -105,7 +132,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/requests-db-adapter</name>
+                                                       <name>${docker.image.prefix}/request-db-adapter</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -130,7 +157,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/sdnc-adapter</name>
+                                                       <name>${docker.image.prefix}/sdnc-adapter</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -155,7 +182,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/openstack-adapters</name>
+                                                       <name>${docker.image.prefix}/openstack-adapter</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -180,7 +207,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/vfc-adapter</name>
+                                                       <name>${docker.image.prefix}/vfc-adapter</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -205,7 +232,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/asdc-controller</name>
+                                                       <name>${docker.image.prefix}/sdc-controller</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -230,7 +257,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/bpmn-infra</name>
+                                                       <name>${docker.image.prefix}/bpmn-infra</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -255,7 +282,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/api-handler-infra</name>
+                                                       <name>${docker.image.prefix}/api-handler-infra</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -279,6 +306,31 @@
                                                                </assembly>
                                                        </build>
                                                </image>
+                                               <image>
+                                                       <name>${docker.image.prefix}/so-monitoring</name>
+                                                       <build>
+                                                               <cleanup>try</cleanup>
+                                                               <dockerFileDir>docker-files</dockerFileDir>
+                                                               <dockerFile>Dockerfile.so-app</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.monitoring:so-monitoring-service</include>
+                                                                                               </includes>
+                                                                                               <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                                                       </dependencySet>
+                                                                               </dependencySets>
+                                                                       </inline>
+                                                               </assembly>
+                                                       </build>
+                                               </image>
                                        </images>
                                </configuration>
 
@@ -304,13 +356,13 @@
 
                                        <execution>
                                                <id>push-images</id>
-                                               <phase>deploy</phase>
+                                               <phase>${docker.push.phase}</phase>
                                                <goals>
                                                        <goal>build</goal>
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>
-                                                       <image>so/catalog-db-adapter,so/requests-db-adapter,so/sdnc-adapter,so/openstack-adapters,so/asdc-controller,so/bpmn-infra,so/api-handler-infra</image>
+                                                       <image>${docker.image.prefix}/catalog-db-adapter,${docker.image.prefix}/request-db-adapter,${docker.image.prefix}/sdnc-adapter,${docker.image.prefix}/openstack-adapter,${docker.image.prefix}/vfc-adapter,${docker.image.prefix}/sdc-controller,${docker.image.prefix}/bpmn-infra,${docker.image.prefix}/api-handler-infra,${docker.image.prefix}/so-monitoring</image>
                                                </configuration>
                                        </execution>
                                </executions>
@@ -328,6 +380,11 @@
        </build>
 
        <dependencies>
+               <dependency>
+                       <groupId>org.onap.so.adapters</groupId>
+                       <artifactId>mso-vnfm-etsi-adapter</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.onap.so.adapters</groupId>
                        <artifactId>mso-catalog-db-adapter</artifactId>
@@ -368,5 +425,10 @@
                        <artifactId>mso-api-handler-infra</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.so.monitoring</groupId>
+                       <artifactId>so-monitoring-service</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
        </dependencies>
 </project>