aboutsummaryrefslogtreecommitdiffstats
path: root/pnfsimulator
diff options
context:
space:
mode:
authorKrzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>2020-04-22 13:05:42 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-22 13:05:42 +0000
commit05744704372014b511b3c36c794a8c80bdd7a0bb (patch)
tree608948068060463c834f940c43d6bac269f27a4f /pnfsimulator
parentc9743fbf57cafeb4bf02b6ba09aac5969ea8ef67 (diff)
parentfda2cdfaa4aa0ea294f17e98e17687670e9b8d16 (diff)
Merge "Rename docker images"
Diffstat (limited to 'pnfsimulator')
-rw-r--r--pnfsimulator/docker-compose.yml2
-rw-r--r--pnfsimulator/pom.xml7
2 files changed, 4 insertions, 5 deletions
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>