Containerization feature of SO

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

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index b13bbcf..c84902a 100644 (file)
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.so</groupId>
                <artifactId>packages</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.3.0-SNAPSHOT</version>
        </parent>
 
        <packaging>pom</packaging>
@@ -24,6 +24,8 @@
                <mso.chef.git.url.suffix.chef.repo>so/chef-repo</mso.chef.git.url.suffix.chef.repo>
                <mso.chef.git.url.suffix.chef.config>so/so-config</mso.chef.git.url.suffix.chef.config>
                <mso.project.version>${project.version}</mso.project.version>
+               <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+               <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
        </properties>
 
        <build>
@@ -32,6 +34,7 @@
                    <plugin>
                 <groupId>org.codehaus.groovy.maven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
                 <executions>
                   <execution>
                     <phase>validate</phase>
@@ -99,11 +102,13 @@
                        <plugin>
                                <groupId>io.fabric8</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
-                               <version>0.16.5</version>
+                               <version>0.19.1</version>
 
                                <configuration>
                                        <verbose>true</verbose>
                                        <apiVersion>1.23</apiVersion>
+                                       <pullRegistry>${docker.pull.registry}</pullRegistry>
+                                       <pushRegistry>${docker.push.registry}</pushRegistry>
 
                                        <images>
                                                <image>
@@ -112,7 +117,7 @@
                                                        <build>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
-                                                               <dockerFile>docker-files/Dockerfile.jacoco</dockerFile>
+                                                               <dockerFile>Dockerfile.jacoco</dockerFile>
 
                                                        </build>
                                                </image>
@@ -123,7 +128,7 @@
 
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
-                                                               <dockerFile>docker-files/Dockerfile.ubuntu-16.04-update</dockerFile>
+                                                               <dockerFile>Dockerfile.ubuntu-16.04-update</dockerFile>
 
                                                        </build>
                                                </image>
@@ -134,27 +139,15 @@
 
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
-                                                               <dockerFile>docker-files/Dockerfile.wildfly-10</dockerFile>
-
-                                                       </build>
-                                               </image>
-                                               <image>
-                                                       <name>openecomp/mso-arquillian:%l</name>
-                                                       <alias>mso-arquillian</alias>
-                                                       <build>
-                                                               <tags>
-                                                                   <tag>${project.docker.latesttag.version}</tag>
-                                                                       <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-                                                               </tags>
-                                                               <cleanup>try</cleanup>
-                                                               <dockerFileDir>docker-files</dockerFileDir>
-                                                               <dockerFile>docker-files/Dockerfile.mso-arquillian</dockerFile>
+                                                               <dockerFile>Dockerfile.wildfly-10</dockerFile>
 
                                                        </build>
                                                </image>
                                                <image>
                                                        <name>openecomp/mso:%l</name>
-                                                       <alias>mso</alias>
+                                                       <alias>onap/so:%1</alias>
+                                                       <alias>openecomp/mso:%l</alias>
+                                                       <alias>so</alias>
                                                        <build>
                                                                <tags>
                                                                        <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
@@ -162,7 +155,7 @@
                                                                </tags>
                                                                <cleanup>try</cleanup>
                                                                <dockerFileDir>docker-files</dockerFileDir>
-                                                               <dockerFile>docker-files/Dockerfile.mso-chef-final</dockerFile>
+                                                               <dockerFile>Dockerfile.mso-chef-final</dockerFile>
                                                                <assembly>
                                                                        <basedir>/</basedir>
 
@@ -184,7 +177,7 @@
                                                </goals>
                                                <configuration>
                                                        <removeAll>true</removeAll>
-                                                       <image>openecomp/mso-arquillian:%l,openecomp/mso:%l</image>
+                                                       <image>openecomp/mso:%l</image>
                                                </configuration>
                                        </execution>
 
@@ -204,7 +197,7 @@
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>
-                                                       <image>openecomp/mso-arquillian:%l,openecomp/mso:%l,openecomp/jacoco:1.0</image>
+                                                       <image>openecomp/mso:%l,openecomp/jacoco:1.0</image>
                                                </configuration>
                                        </execution>
                                </executions>