aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Donley <christopher.donley@huawei.com>2018-04-12 12:43:23 -0700
committerChris Donley <christopher.donley@huawei.com>2018-04-13 15:42:43 -0700
commitfeb2fddd4cffd634e48629cc3c7648a3e23ddc1b (patch)
tree76c91435e9d38b384a7ec3e8336c88c70907a2d0
parente345052ecaecde4835b9694251fbdb2110941d90 (diff)
Fix vnfsdk docker naming
updating docker names to include vnfsdk (refrepo, refrepo/postgres) Issue-ID: VNFSDK-251 Change-Id: I0e9843bb6e259a6374dbc61c8fdec3d20902bb54 Signed-off-by: Chris Donley <christopher.donley@huawei.com>
-rw-r--r--vnfmarket-be/deployment/docker/docker-postgres/pom.xml6
-rw-r--r--vnfmarket-be/deployment/docker/docker-refrepo/pom.xml10
-rw-r--r--vnfmarket-be/deployment/install/docker-compose.yml4
-rwxr-xr-xvnfmarket-be/deployment/install/vnfsdk_vm_init.sh4
4 files changed, 12 insertions, 12 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
index be4594c8..eb0b88c3 100644
--- a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
@@ -57,7 +57,7 @@
<skipDocker>${docker.skip}</skipDocker>
<images>
<image>
- <name>onap/refrepo/postgres</name>
+ <name>onap/vnfsdk/refrepo/postgres</name>
<alias>postgres</alias>
<build>
<cleanup>try</cleanup>
@@ -77,7 +77,7 @@
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>onap/refrepo/postgres</image>
+ <image>onap/vnfsdk/refrepo/postgres</image>
</configuration>
</execution>
@@ -99,7 +99,7 @@
<goal>push</goal>
</goals>
<configuration>
- <image>onap/refrepo/postgres</image>
+ <image>onap/vnfsdk/refrepo/postgres</image>
</configuration>
</execution>
</executions>
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
index 8d1bf43e..fb8f274f 100644
--- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
@@ -48,7 +48,7 @@
<version>1.0.0</version>
<configuration>
<verbose>true</verbose>
- <imageName>onap/refrepo</imageName>
+ <imageName>onap/vnfsdk/refrepo</imageName>
<serverId>docker-hub</serverId>
<dockerDirectory>${basedir}/src/main/docker</dockerDirectory>
<resources>
@@ -80,8 +80,8 @@
<goal>tag</goal>
</goals>
<configuration>
- <image>onap/refrepo</image>
- <newName>${docker.push.registry}/onap/refrepo:${project.version}-${maven.build.timestamp}</newName>
+ <image>onap/vnfsdk/refrepo</image>
+ <newName>${docker.push.registry}/onap/vnfsdk/refrepo:${project.version}-${maven.build.timestamp}</newName>
<pushImage>${skip.docker.push}</pushImage>
<skipDockerTag>${skip.docker.tag}</skipDockerTag>
</configuration>
@@ -93,8 +93,8 @@
<goal>tag</goal>
</goals>
<configuration>
- <image>onap/refrepo</image>
- <newName>${docker.push.registry}/onap/refrepo:latest</newName>
+ <image>onap/vnfsdk/refrepo</image>
+ <newName>${docker.push.registry}/onap/vnfsdk/refrepo:latest</newName>
<pushImage>${skip.docker.push}</pushImage>
<skipDockerTag>${skip.docker.tag}</skipDockerTag>
</configuration>
diff --git a/vnfmarket-be/deployment/install/docker-compose.yml b/vnfmarket-be/deployment/install/docker-compose.yml
index 75f31c20..00e26fb0 100644
--- a/vnfmarket-be/deployment/install/docker-compose.yml
+++ b/vnfmarket-be/deployment/install/docker-compose.yml
@@ -9,7 +9,7 @@ services:
postgres:
container_name: "postgres"
restart: "always"
- image: "${NEXUS_REPO}/onap/refrepo/postgres:${POSTGRES_TAG}"
+ image: "${NEXUS_REPO}/onap/vnfsdk/refrepo/postgres:${POSTGRES_TAG}"
mem_limit: "1g"
memswap_limit: "1g"
ports:
@@ -18,7 +18,7 @@ services:
refrepo:
container_name: "refrepo"
restart: "always"
- image: "${NEXUS_REPO}/onap/refrepo:${REFREPO_TAG}"
+ image: "${NEXUS_REPO}/onap/vnfsdk/refrepo:${REFREPO_TAG}"
ports:
- "8702-8703:8702-8703"
- "8000:8000"
diff --git a/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh b/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh
index e1db6b5a..a3bcba8a 100755
--- a/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh
+++ b/vnfmarket-be/deployment/install/vnfsdk_vm_init.sh
@@ -22,8 +22,8 @@ source .env
# Refresh images
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/refrepo:${REFREPO_TAG}
-docker pull $NEXUS_DOCKER_REPO/onap/refrepo:${POSTGRES_TAG}
+docker pull $NEXUS_DOCKER_REPO/onap/vnfsdk/refrepo:${REFREPO_TAG}
+docker pull $NEXUS_DOCKER_REPO/onap/vnfsdk/refrepo:${POSTGRES_TAG}
# docker-compose is not in /usr/bin