Rename asdc-controller docker image

OOM would like it to be called onap/so/sdc-controller.

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

diff --git a/deploy.sh b/deploy.sh
index 8e8bb66..4e85ca6 100755 (executable)
--- a/deploy.sh
+++ b/deploy.sh
@@ -92,8 +92,8 @@ function pull_docker_images() {
     $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/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/onap/so/sdc-controller:$MSO_DOCKER_IMAGE_VERSION
+    $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/sdc-controller:$MSO_DOCKER_IMAGE_VERSION onap/so/sdc-controller: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

diff --git a/docker-compose.yml b/docker-compose.yml
index 7e148ae..e17aa2e 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -195,15 +195,15 @@ services:
       - --
       - "/app/start-app.sh"
 ################################################################################
-  asdc-controller:
-    image: onap/so/asdc-controller
+  sdc-controller:
+    image: onap/so/sdc-controller
     ports:
       - "8085:8085"
     volumes:
       - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates
-      - ./volumes/so/config/asdc-controller/onapheat:/app/config
+      - ./volumes/so/config/sdc-controller/onapheat:/app/config
     environment:
-      - APP=asdc-controller
+      - APP=sdc-controller
       - JVM_ARGS=-Xms64m -Xmx512m
       - DB_HOST=mariadb
 #     - KEYSTORE=msoClientKeyStore-onapheat.jks
@@ -211,7 +211,7 @@ services:
 #     - TRUSTSTORE=msoTrustStore.jks
 #     - TRUSTSTORE_PASSWORD=password
     hostname:
-      asdc-controller.so.testlab.onap.org
+      sdc-controller.so.testlab.onap.org
     depends_on:
       - mariadb
       - catalog-db-adapter

diff --git a/volumes/so/config/asdc-controller/onapheat/override.yaml b/volumes/so/config/sdc-controller/onapheat/override.yaml
similarity index 100%
rename from volumes/so/config/asdc-controller/onapheat/override.yaml
rename to volumes/so/config/sdc-controller/onapheat/override.yaml