X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker-compose%2Fdocker-compose.yml;h=44ebd3bc6992ade4c8a735374f3758724c4668d5;hb=ac6f54fcfd2b07a4804620bd9cfa6de6ce4e1c0c;hp=c928ee88b037135b9fbcaf2d46b2a5b410be07b7;hpb=d181b0e51b6385105362c9b59239ab581cace45e;p=cps.git

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index c928ee88b..44ebd3bc6 100755
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -30,8 +30,8 @@ services:
   #    - "8881:8080"
   #    - "8887:8081"
   #  environment:
-  #    CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
-  #    CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+  #    CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
+  #    CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
   #    DB_HOST: dbpostgresql
   #    DB_USERNAME: ${DB_USERNAME:-cps}
   #    DB_PASSWORD: ${DB_PASSWORD:-cps}
@@ -49,8 +49,8 @@ services:
   #    - "8882:8080"
   #    - "8887:8081"
   #  environment:
-  #    CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
-  #    CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+  #    CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
+  #    CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
   #    DB_HOST: dbpostgresql
   #    DB_USERNAME: ${DB_USERNAME:-cps}
   #    DB_PASSWORD: ${DB_PASSWORD:-cps}
@@ -89,7 +89,7 @@ services:
     container_name: dbpostgresql
     image: postgres:13.2-alpine
     ports:
-      - '5432:5432'
+      - ${DB_PORT:-5432}:5432
     environment:
       POSTGRES_DB: cpsdb
       POSTGRES_USER: ${DB_USERNAME:-cps}
@@ -97,14 +97,14 @@ services:
 
   cps-and-ncmp:
     container_name: cps-and-ncmp
-    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION:-latest}
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${CPS_VERSION:-latest}
     ports:
-      - "8883:8080"
-      - "8887:8081"
+      - ${CPS_CORE_PORT:-8883}:8080
+      - ${CPS_CORE_MANAGEMENT_PORT:-8887}:8081
     environment:
-      CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
-      CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
-      DB_HOST: ${DB_HOST}
+      CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
+      CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
+      DB_HOST: ${DB_HOST:-dbpostgresql}
       DB_USERNAME: ${DB_USERNAME:-cps}
       DB_PASSWORD: ${DB_PASSWORD:-cps}
       DMI_USERNAME: ${DMI_USERNAME:-cpsuser}
@@ -114,26 +114,4 @@ services:
       #NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
     restart: unless-stopped
     depends_on:
-      - dbpostgresql
-
-  ncmp-dmi-plugin:
-    container_name: ncmp-dmi-plugin
-    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${VERSION:-latest}
-    ports:
-      - "8783:8080"
-      - "8787:8081"
-    environment:
-      DMI_USERNAME: ${DMI_USERNAME:-cpsuser}
-      DMI_PASSWORD: ${DMI_PASSWORD:-cpsr0cks!}
-      CPS_CORE_HOST: ${CPS_CORE_HOST}
-      CPS_CORE_PORT: ${CPS_CORE_PORT:-8883}
-      CPS_CORE_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
-      CPS_CORE_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
-      SDNC_HOST: ${SDNC_HOST}
-      SDNC_PORT: ${SDNC_PORT:-8282}
-      SDNC_USERNAME: ${SDNC_USERNAME:-admin}
-      SDNC_PASSWORD: ${SDNC_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-      DMI_SERVICE_URL: ${DMI_SERVICE_URL}
-    restart: unless-stopped
-    depends_on:
-      - cps-and-ncmp   #it depends on cps_and_ncmp for registration but as a container it can run independently.
\ No newline at end of file
+      - dbpostgresql
\ No newline at end of file