Merge "Docker image building and docker-compose for cps-nf-proxy"

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

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 6894d3f..391d911 100644 (file)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -2,16 +2,28 @@ version: "3.7"
 
 services:
   cps:
-    restart: unless-stopped
-    image: nexus3.onap.org:10001/onap/cps-service:${VERSION}
     container_name: cps-service
+    image: nexus3.onap.org:10001/onap/cps-service:${VERSION}
+    ports:
+      - "8080:8080"
     environment:
       DB_HOST: ${DB_HOST}
       DB_USERNAME: ${DB_USERNAME}
       DB_PASSWORD: ${DB_PASSWORD}
+    restart: unless-stopped
+    depends_on:
+      - dbpostgresql
+
+  cps-nf-proxy:
+    container_name: cps-nf-proxy
+    image: nexus3.onap.org:10001/onap/cps-nf-proxy:${VERSION}
     ports:
-      - "8080:8080"
-    network_mode: "host
+      - "8081:8080"
+    environment:
+      DB_HOST: ${DB_HOST}
+      DB_USERNAME: ${DB_USERNAME}
+      DB_PASSWORD: ${DB_PASSWORD}
+    restart: unless-stopped
     depends_on:
       - dbpostgresql
 
@@ -21,6 +33,6 @@ services:
     ports:
       - '5432:5432'
     environment:
-      DB_NAME: cpsdb
-      DB_USERNAME: ${DB_USERNAME}
-      DB_PASSWORD: ${DB_PASSWORD}
\ No newline at end of file
+      POSTGRES_DB: cpsdb
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
\ No newline at end of file