From: Rob Daugherty <rd472p@att.com>
Date: Mon, 20 Aug 2018 17:06:32 +0000 (-0400)
Subject: Docker naming convention
X-Git-Tag: 3.0.0-ONAP~22
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=14149bb6b189044d3dae9ae40ab665b43b8619f6;p=so%2Fdocker-config.git

Docker naming convention

Docker image names have change as follows:

    so/catalog-db-adapter --> onap/so/catalog-db-adapter
    so/request-db-adapter --> onap/so/request-db-adapter
    so/sdnc-adapter --> onap/so/sdnc-adapter
    so/openstack-adapter --> onap/so/openstack-adapter
    so/vfc-adapter --> onap/so/vfc-adapter
    so/asdc-controller --> onap/so/asdc-controller
    so/bpmn-infra --> onap/so/bpmn-infra
    so/api-handler-infra --> onap/so/api-handler-infra

This commit adjusts the "compose" script and the heat
environment installation script.

Change-Id: I69a0c1f51d8bb3a1ddbadaf15f8d813d7188a8ec
Issue-ID: SO-870
Signed-off-by: Rob Daugherty <rd472p@att.com>
---

diff --git a/deploy.sh b/deploy.sh
index 9201f43..aec1792 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -86,29 +86,29 @@ function pull_docker_images() {
     $DOCKER_CMD login -u $NEXUS_USERNAME_MARIADB -p $NEXUS_PASSWD_MARIADB $NEXUS_DOCKER_REPO_MARIADB
     
     # get images
-    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/so/api-handler-infra:$MSO_DOCKER_IMAGE_VERSION
-    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/so/api-handler-infra:$MSO_DOCKER_IMAGE_VERSION so/api-handler-infra:latest
+    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/api-handler-infra:$MSO_DOCKER_IMAGE_VERSION
+    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/api-handler-infra:$MSO_DOCKER_IMAGE_VERSION onap/so/api-handler-infra:latest
     
-    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/so/bpmn-infra:$MSO_DOCKER_IMAGE_VERSION
-    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/so/bpmn-infra:$MSO_DOCKER_IMAGE_VERSION so/bpmn-infra:latest
+    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/bpmn-infra:$MSO_DOCKER_IMAGE_VERSION
+    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/bpmn-infra:$MSO_DOCKER_IMAGE_VERSION onap/so/bpmn-infra:latest
     
-    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/so/asdc-controller:$MSO_DOCKER_IMAGE_VERSION
-    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/so/asdc-controller:$MSO_DOCKER_IMAGE_VERSION so/asdc-controller:latest
+    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/asdc-controller:$MSO_DOCKER_IMAGE_VERSION
+    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/asdc-controller:$MSO_DOCKER_IMAGE_VERSION onap/so/asdc-controller:latest
     
-    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/so/vfc-adapter:$MSO_DOCKER_IMAGE_VERSION
-    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/so/vfc-adapter:$MSO_DOCKER_IMAGE_VERSION so/vfc-adapter:latest
+    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/vfc-adapter:$MSO_DOCKER_IMAGE_VERSION
+    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/vfc-adapter:$MSO_DOCKER_IMAGE_VERSION onap/so/vfc-adapter:latest
         
-    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/so/openstack-adapter:$MSO_DOCKER_IMAGE_VERSION
-    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/so/openstack-adapter:$MSO_DOCKER_IMAGE_VERSION so/openstack-adapter:latest
+    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/openstack-adapter:$MSO_DOCKER_IMAGE_VERSION
+    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/openstack-adapter:$MSO_DOCKER_IMAGE_VERSION onap/so/openstack-adapter:latest
     
-    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/so/catalog-db-adapter:$MSO_DOCKER_IMAGE_VERSION
-    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/so/catalog-db-adapter:$MSO_DOCKER_IMAGE_VERSION so/catalog-db-adapter:latest
+    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/catalog-db-adapter:$MSO_DOCKER_IMAGE_VERSION
+    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/catalog-db-adapter:$MSO_DOCKER_IMAGE_VERSION onap/so/catalog-db-adapter:latest
     
-    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/so/request-db-adapter:$MSO_DOCKER_IMAGE_VERSION
-    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/so/request-db-adapter:$MSO_DOCKER_IMAGE_VERSION so/request-db-adapter:latest
+    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/request-db-adapter:$MSO_DOCKER_IMAGE_VERSION
+    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/request-db-adapter:$MSO_DOCKER_IMAGE_VERSION onap/so/request-db-adapter:latest
     
-    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/so/sdnc-adapter:$MSO_DOCKER_IMAGE_VERSION
-    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/so/sdnc-adapter:$MSO_DOCKER_IMAGE_VERSION so/sdnc-adapter:latest
+    $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/sdnc-adapter:$MSO_DOCKER_IMAGE_VERSION
+    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/sdnc-adapter:$MSO_DOCKER_IMAGE_VERSION onap/so/sdnc-adapter:latest
     
     echo "Using Nexus for MARIADB: $NEXUS_DOCKER_REPO_MARIADB (user "$NEXUS_USERNAME_MARIADB")"
     $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MARIADB/mariadb:10.1.11
diff --git a/docker-compose.yml b/docker-compose.yml
index 8363553..7e148ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,7 +24,7 @@ services:
         max-file: "5"
 ################################################################################
   catalog-db-adapter:
-    image: so/catalog-db-adapter
+    image: onap/so/catalog-db-adapter
     ports:
       - "8082:8082"
     volumes:
@@ -57,7 +57,7 @@ services:
       - "/app/start-app.sh"
 ################################################################################
   request-db-adapter:
-    image: so/request-db-adapter
+    image: onap/so/request-db-adapter
     ports:
       - "8083:8083"
     volumes:
@@ -91,7 +91,7 @@ services:
       - "/app/start-app.sh"
 ################################################################################
   sdnc-adapter:
-    image: so/sdnc-adapter
+    image: onap/so/sdnc-adapter
     ports:
       - "8090:8086"
     volumes:
@@ -126,7 +126,7 @@ services:
       - "/app/start-app.sh"
 ################################################################################
   openstack-adapter:
-    image: so/openstack-adapter
+    image: onap/so/openstack-adapter
     ports:
       - "8087:8087"
     volumes:
@@ -161,7 +161,7 @@ services:
       - "/app/start-app.sh"
 ################################################################################
   vfc-adapter:
-    image: so/vfc-adapter
+    image: onap/so/vfc-adapter
     ports:
       - "8084:8084"
     volumes:
@@ -196,7 +196,7 @@ services:
       - "/app/start-app.sh"
 ################################################################################
   asdc-controller:
-    image: so/asdc-controller
+    image: onap/so/asdc-controller
     ports:
       - "8085:8085"
     volumes:
@@ -231,7 +231,7 @@ services:
       - "/app/start-app.sh"
 ################################################################################
   bpmn-infra:
-    image: so/bpmn-infra
+    image: onap/so/bpmn-infra
     ports:
       - "8081:8081"
     volumes:
@@ -266,7 +266,7 @@ services:
       - "/app/start-app.sh"
 ################################################################################
   api-handler-infra:
-    image: so/api-handler-infra
+    image: onap/so/api-handler-infra
     ports:
       - "8080:8080"
     volumes: