From b77bf2529f15e60c852cf83d5150e75d30068bb0 Mon Sep 17 00:00:00 2001
From: "Claudio D. Gasparini" <claudio.gasparini@pantheon.tech>
Date: Thu, 28 Jan 2021 15:36:37 +0100
Subject: Decouple configuration from application

- Decouple configuration from application
- Generate all 3 types of docker variations

Issue-ID: CPS-175
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
Change-Id: I1e2e0577c5911f7c79801e4c691d196515dc02a1
---
 docker-compose/README.md          | 16 ++++++++++++++--
 docker-compose/docker-compose.yml | 14 +-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'docker-compose')

diff --git a/docker-compose/README.md b/docker-compose/README.md
index 619b0d4a8..ca395df07 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -1,7 +1,19 @@
-# Docker Compose
+# Docker Compose deployment example for local enviroments, CPS deployment is done via OOM
 
 To run the application locally using `docker-compose`, execute following command from this `docker-compose` folder:
 
+Generate the containers
+
+```bash
+mvn clean install -Pcps-docker -Pxnf-docker -Pcps-xnf-docker
+```
+or for generate an specific type
+
+```bash
+mvn clean install -Pcps-docker
+```
+Run the containers
+
 ```bash
-VERSION=0.0.1-SNAPSHOT DB_HOST=dbpostgresql DB_USERNAME=cps DB_PASSWORD=cps docker-compose up
+VERSION=0.0.1-SNAPSHOT DB_HOST=dbpostgresql DB_USERNAME=cps DB_PASSWORD=cps docker-compose up -d
 ```
\ No newline at end of file
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 391d91109..accdbd4db 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     container_name: cps-service
     image: nexus3.onap.org:10001/onap/cps-service:${VERSION}
     ports:
-      - "8080:8080"
+      - "8881:8080"
     environment:
       DB_HOST: ${DB_HOST}
       DB_USERNAME: ${DB_USERNAME}
@@ -14,18 +14,6 @@ services:
     depends_on:
       - dbpostgresql
 
-  cps-nf-proxy:
-    container_name: cps-nf-proxy
-    image: nexus3.onap.org:10001/onap/cps-nf-proxy:${VERSION}
-    ports:
-      - "8081:8080"
-    environment:
-      DB_HOST: ${DB_HOST}
-      DB_USERNAME: ${DB_USERNAME}
-      DB_PASSWORD: ${DB_PASSWORD}
-    restart: unless-stopped
-    depends_on:
-      - dbpostgresql
 
   dbpostgresql:
     container_name: dbpostgresql
-- 
cgit 1.2.3-korg