From: Bin Yang <bin.yang@windriver.com>
Date: Mon, 15 Jul 2019 07:20:44 +0000 (+0000)
Subject: Refine the docker profile
X-Git-Tag: 1.4.1~26
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F91423%2F1;p=multicloud%2Fopenstack.git

Refine the docker profile

Change-Id: I83779d2d566ff8b120fb712924e6d88e771cafa6
Issue-ID: MULTICLOUD-704
Signed-off-by: Bin Yang <bin.yang@windriver.com>
---

diff --git a/pom.xml b/pom.xml
index ac2dcb04..78ac07bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <container-public-registry>nexus3.onap.org:10001</container-public-registry>
+        <container-staging-registry>nexus3.onap.org:10003</container-staging-registry>
     </properties>
 
     <modules>
diff --git a/windriver/pom.xml b/windriver/pom.xml
index 9aa31794..1eb5a1c6 100644
--- a/windriver/pom.xml
+++ b/windriver/pom.xml
@@ -119,7 +119,9 @@
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>copy-resources</id>
@@ -152,21 +154,21 @@
                                         <exec executable="docker">
                                            <arg value="build"/>
                                            <arg value="-t"/>
-                                           <arg value="nexus3.onap.org:10003/onap/multicloud/openstack-windriver:${project.version}"/>
+                                           <arg value="${container-staging-registry}/onap/multicloud/openstack-windriver:${project.version}"/>
                                            <arg value="docker_target"/>
                                         </exec>
                                         <exec executable="docker">
                                             <arg value="tag"/>
-                                            <arg value="nexus3.onap.org:10003/onap/multicloud/openstack-windriver:${project.version}"/>
-                                            <arg value="nexus3.onap.org:10003/onap/multicloud/openstack-windriver:latest"/>
+                                            <arg value="${container-staging-registry}/onap/multicloud/openstack-windriver:${project.version}"/>
+                                            <arg value="${container-staging-registry}/onap/multicloud/openstack-windriver:latest"/>
                                         </exec>
                                         <exec executable="docker">
                                             <arg value="push"/>
-                                            <arg value="nexus3.onap.org:10003/onap/multicloud/openstack-windriver:${project.version}"/>
+                                            <arg value="${container-staging-registry}/onap/multicloud/openstack-windriver:${project.version}"/>
                                         </exec>
                                         <exec executable="docker">
                                             <arg value="push"/>
-                                            <arg value="nexus3.onap.org:10003/onap/multicloud/openstack-windriver:latest"/>
+                                            <arg value="${container-staging-registry}/onap/multicloud/openstack-windriver:latest"/>
                                         </exec>
                                     </target>
                                 </configuration>