Aligning differing openAPI paths (cps-rest & ncmp-rest)

[cps.git] / docker-compose / docker-compose.yml

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
old mode 100644 (file)
new mode 100755 (executable)
index 0cd4951..f01d12d
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -21,13 +21,13 @@ version: "3.7"
 services:
   #cps-standalone:
   #  container_name: cps-service
-  #  image: cps-service:${VERSION}
-  #  volumes:
-  #    - "./application.yml:/app/resources/application.yml"
+  #  image: onap/cps-service:${VERSION:-latest}
   #  ports:
   #    - "8881:8080"
   #  environment:
-  #    DB_HOST: ${DB_HOST}
+  #    CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
+  #    CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+  #    DB_HOST: dbpostgresql
   #    DB_USERNAME: ${DB_USERNAME}
   #    DB_PASSWORD: ${DB_PASSWORD}
   #  restart: unless-stopped
@@ -36,13 +36,13 @@ services:
 
   #ncmp-standalone:
   #  container_name: cps-ncmp
-  #  image: cps-ncmp:${VERSION}
-  #  volumes:
-  #    - "./application.yml:/app/resources/application.yml"
+  #  image: onap/cps-ncmp:${VERSION:-latest}
   #  ports:
   #    - "8882:8080"
   #  environment:
-  #    DB_HOST: ${DB_HOST}
+  #    CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
+  #    CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+  #    DB_HOST: dbpostgresql
   #    DB_USERNAME: ${DB_USERNAME}
   #    DB_PASSWORD: ${DB_PASSWORD}
   #  restart: unless-stopped
@@ -51,10 +51,12 @@ services:
 
   cps-and-ncmp:
     container_name: cps-and-ncmp
-    image: cps-and-ncmp:${VERSION}
+    image: onap/cps-and-ncmp:${VERSION:-latest}
     ports:
       - "8883:8080"
     environment:
+      CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
+      CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
       DB_HOST: dbpostgresql
       DB_USERNAME: ${DB_USERNAME}
       DB_PASSWORD: ${DB_PASSWORD}
@@ -64,7 +66,7 @@ services:
 
   dbpostgresql:
     container_name: dbpostgresql
-    image: postgres:12.4-alpine
+    image: postgres:13.2-alpine
     ports:
       - '5432:5432'
     environment: