Merge "Addition of Dockerfile/logback for SO-Monitoring"

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

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 5fafb4a..3147c02 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -49,7 +49,7 @@
                                                                if ( project.properties['so.project.version'].endsWith("-SNAPSHOT") ) {
                                                                        project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest";
                                                                } else {
-                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
                                                                }
 
                                                                println 'New tag for docker: ' + project.properties['project.docker.latesttag.version'];
@@ -72,7 +72,7 @@
 
                                        <images>
                                                <image>
-                                                       <name>so/base-image:1.0</name>
+                                                       <name>onap/so/base-image:1.0</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -80,7 +80,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/catalog-db-adapter</name>
+                                                       <name>onap/so/catalog-db-adapter</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -105,7 +105,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/requests-db-adapter</name>
+                                                       <name>onap/so/request-db-adapter</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -130,7 +130,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/sdnc-adapter</name>
+                                                       <name>onap/so/sdnc-adapter</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -155,7 +155,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/openstack-adapters</name>
+                                                       <name>onap/so/openstack-adapter</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -180,7 +180,32 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/asdc-controller</name>
+                                                       <name>onap/so/vfc-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-vfc-adapter</include>
+                                                                                               </includes>
+                                                                                               <outputFileNameMapping>app.jar</outputFileNameMapping>
+                                                                                       </dependencySet>
+                                                                               </dependencySets>
+                                                                       </inline>
+                                                               </assembly>
+                                                       </build>
+                                               </image>
+                                               <image>
+                                                       <name>onap/so/sdc-controller</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -205,7 +230,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/bpmn-infra</name>
+                                                       <name>onap/so/bpmn-infra</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -230,7 +255,7 @@
                                                        </build>
                                                </image>
                                                <image>
-                                                       <name>so/api-handler-infra</name>
+                                                       <name>onap/so/api-handler-infra</name>
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
@@ -254,6 +279,31 @@
                                                                </assembly>
                                                        </build>
                                                </image>
+                                               <image>
+                                                       <name>onap/so/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>
 
@@ -285,7 +335,7 @@
                                                        <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>onap/so/catalog-db-adapter,onap/so/request-db-adapter,onap/so/sdnc-adapter,onap/so/openstack-adapter,onap/so/vfc-adapter,onap/so/sdc-controller,onap/so/bpmn-infra,onap/so/api-handler-infra,onap/so/so-monitoring</image>
                                                </configuration>
                                        </execution>
                                </executions>
@@ -323,6 +373,11 @@
                        <artifactId>mso-openstack-adapters</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.so.adapters</groupId>
+                       <artifactId>mso-vfc-adapter</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.onap.so</groupId>
                        <artifactId>asdc-controller</artifactId>
@@ -338,5 +393,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>