Review docker compose

* Fix image names for cps standalone and ncmp standalone services
* Use default db authentication if env variables are not defined

Issue-ID: CPS-435
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: Ib53c48f2c549f6ddb3adb3c12e15a9167a41673d

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 6267834..2878462 100755 (executable)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -21,30 +21,30 @@ version: "3.7"
 services:
   #cps-standalone:
   #  container_name: cps-service
-  #  image: onap/cps-service:${VERSION:-latest}
+  #  image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-service:${VERSION:-latest}
   #  ports:
   #    - "8881:8080"
   #  environment:
   #    CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
   #    CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
   #    DB_HOST: dbpostgresql
-  #    DB_USERNAME: ${DB_USERNAME}
-  #    DB_PASSWORD: ${DB_PASSWORD}
+  #    DB_USERNAME: ${DB_USERNAME:-cps}
+  #    DB_PASSWORD: ${DB_PASSWORD:-cps}
   #  restart: unless-stopped
   #  depends_on:
   #    - dbpostgresql
 
   #ncmp-standalone:
   #  container_name: cps-ncmp
-  #  image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION:-latest}
+  #  image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-ncmp:${VERSION:-latest}
   #  ports:
   #    - "8882:8080"
   #  environment:
   #    CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
   #    CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
   #    DB_HOST: dbpostgresql
-  #    DB_USERNAME: ${DB_USERNAME}
-  #    DB_PASSWORD: ${DB_PASSWORD}
+  #    DB_USERNAME: ${DB_USERNAME:-cps}
+  #    DB_PASSWORD: ${DB_PASSWORD:-cps}
   #  restart: unless-stopped
   #  depends_on:
   #    - dbpostgresql
@@ -58,8 +58,8 @@ services:
       CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
       CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
       DB_HOST: dbpostgresql
-      DB_USERNAME: ${DB_USERNAME}
-      DB_PASSWORD: ${DB_PASSWORD}
+      DB_USERNAME: ${DB_USERNAME:-cps}
+      DB_PASSWORD: ${DB_PASSWORD:-cps}
     restart: unless-stopped
     depends_on:
       - dbpostgresql
@@ -71,5 +71,5 @@ services:
       - '5432:5432'
     environment:
       POSTGRES_DB: cpsdb
-      POSTGRES_USER: ${DB_USERNAME}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${DB_USERNAME:-cps}
+      POSTGRES_PASSWORD: ${DB_PASSWORD:-cps}