Merge "Rename docker images"

5 files changed, 12 insertions, 12 deletions

diff --git a/netconfsimulator/docker-compose.yml b/netconfsimulator/docker-compose.yml
index c44a93b..4bb3935 100644
--- a/netconfsimulator/docker-compose.yml
+++ b/netconfsimulator/docker-compose.yml
@@ -26,7 +26,7 @@ services:
     - zookeeper
 
   netconf-simulator:
-    image: nexus3.onap.org:10003/onap/netconfsimulator
+    image: onap/org.onap.integration.simulators.netconfsimulator
     ports:
     - "9000:8080"
     restart: on-failure
@@ -39,7 +39,7 @@ services:
     - netopeer
 
   netopeer:
-    image: nexus3.onap.org:10003/netopeer
+    image: onap/org.onap.integration.simulators.netopeer
     ports:
     - "830:830"
     - "5002:5002"
diff --git a/netconfsimulator/pom.xml b/netconfsimulator/pom.xml
index 6dbdf0c..45fa70b 100644
--- a/netconfsimulator/pom.xml
+++ b/netconfsimulator/pom.xml
@@ -8,9 +8,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,6 @@
     <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
     <docker.registry>nexus3.onap.org:10003</docker.registry>
     <docker.image.tag>latest</docker.image.tag>
-    <docker.image.name>onap/${project.artifactId}</docker.image.name>
     <dependency.directory.name>libs</dependency.directory.name>
     <dependency.directory.location>${project.build.directory}/${dependency.directory.name}
     </dependency.directory.location>
@@ -284,7 +283,7 @@
                             <images>
                                 <image>
                                     <alias>${project.artifactId}</alias>
-                                    <name>${onap.nexus.dockerregistry.daily}/${docker.image.name}</name>
+                                    <name>${docker-image.namespace}/${docker-image.name.prefix}.${artifactId}</name>
                                     <registry>${onap.nexus.dockerregistry.daily}</registry>
                                     <build>
                                         <contextDir>${project.basedir}</contextDir>
@@ -295,7 +294,7 @@
                                     </build>
                                 </image>
                                 <image>
-                                    <name>${onap.nexus.dockerregistry.daily}/netopeer</name>
+                                    <name>${docker-image.namespace}/${docker-image.name.prefix}.netopeer</name>
                                     <build>
                                         <contextDir>${project.basedir}</contextDir>
                                         <dockerFile>${project.basedir}/Dockerfile_netopeer</dockerFile>
diff --git a/pnfsimulator/docker-compose.yml b/pnfsimulator/docker-compose.yml
index 23797fe..54e4699 100644
--- a/pnfsimulator/docker-compose.yml
+++ b/pnfsimulator/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       ME_CONFIG_MONGODB_ADMINPASSWORD: zXcVbN123!
 
   pnf-simulator:
-    image: nexus3.onap.org:10003/onap/pnfsimulator
+    image: onap/org.onap.integration.simulators.pnfsimulator
     ports:
       - "5000:5000"
     volumes:
diff --git a/pnfsimulator/pom.xml b/pnfsimulator/pom.xml
index 436571d..6384314 100644
--- a/pnfsimulator/pom.xml
+++ b/pnfsimulator/pom.xml
@@ -8,9 +8,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -42,7 +42,6 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
         <simulator.main.class>org.onap.pnfsimulator.Main</simulator.main.class>
         <docker.image.tag>latest</docker.image.tag>
-        <docker.image.name>onap/${project.artifactId}</docker.image.name>
         <dependency.directory.name>libs</dependency.directory.name>
         <dependency.directory.location>${project.build.directory}/${dependency.directory.name}
         </dependency.directory.location>
@@ -355,7 +354,7 @@
                             <images>
                                 <image>
                                     <alias>${project.artifactId}</alias>
-                                    <name>${onap.nexus.dockerregistry.daily}/${docker.image.name}</name>
+                                    <name>${docker-image.namespace}/${docker-image.name.prefix}.${artifactId}</name>
                                     <registry>${onap.nexus.dockerregistry.daily}</registry>
                                     <build>
                                         <dockerFileDir>${project.basedir}</dockerFileDir>
diff --git a/pom.xml b/pom.xml
index 50bf928..8bbd874 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,8 @@
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+        <docker-image.namespace>onap</docker-image.namespace>
+        <docker-image.name.prefix>org.onap.integration.simulators</docker-image.name.prefix>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>