From 4e07d48caae2cdcfa2a583070c08bb572dbb683f Mon Sep 17 00:00:00 2001
From: "Claudio D. Gasparini" <claudio.gasparini@pantheon.tech>
Date: Thu, 11 Feb 2021 08:51:06 +0100
Subject: Update docker-compose

- Add more documentation
- fix application.yml location for service

Issue-ID: CPS-236
Co-authored-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: I5a16f520c9536d2034c2afd1de947058d2fb13ee
---
 docker-compose/docker-compose.yml | 79 ++++++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 31 deletions(-)

(limited to 'docker-compose/docker-compose.yml')

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index beae091f1..fcb4a5381 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,41 +1,58 @@
+# ============LICENSE_START=======================================================
+# Copyright (c) 2020 Pantheon.tech.
+# Modifications Copyright (C) 2021 Bell Canada.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
 version: "3.7"
 
 services:
-  cps:
-    container_name: cps-service
-    image: nexus3.onap.org:10001/onap/cps-service:${VERSION}
-    volumes:
-      - "./application.yml:/app/application.yml"
-    ports:
-      - "8881:8080"
-    environment:
-      DB_HOST: ${DB_HOST}
-      DB_USERNAME: ${DB_USERNAME}
-      DB_PASSWORD: ${DB_PASSWORD}
-    restart: unless-stopped
-    depends_on:
-      - dbpostgresql
+  #cps-standalone:
+  #  container_name: cps-service
+  #  image: ps-service:${VERSION}
+  #  volumes:
+  #    - "./application.yml:/app/resources/application.yml"
+  #  ports:
+  #    - "8881: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}
-    volumes:
-      - "./application.yml:/app/application.yml"
-    ports:
-      - "8882:8080"
-    environment:
-      DB_HOST: ${DB_HOST}
-      DB_USERNAME: ${DB_USERNAME}
-      DB_PASSWORD: ${DB_PASSWORD}
-    restart: unless-stopped
-    depends_on:
-      - dbpostgresql
+  #nf-proxy-standalone:
+  #  container_name: cps-nf-proxy
+  #  image: cps-nf-proxy:${VERSION}
+  #  volumes:
+  #    - "./application.yml:/app/resources/application.yml"
+  #  ports:
+  #    - "8882:8080"
+  #  environment:
+  #    DB_HOST: ${DB_HOST}
+  #    DB_USERNAME: ${DB_USERNAME}
+  #    DB_PASSWORD: ${DB_PASSWORD}
+  #  restart: unless-stopped
+  #  depends_on:
+  #    - dbpostgresql
 
   cps-and-nf-proxy:
     container_name: cps-and-nf-proxy
-    image: nexus3.onap.org:10001/onap/cps-and-nf-proxy:${VERSION}
+    image: cps-and-nf-proxy:${VERSION}
     volumes:
-      - "./application.yml:/app/application.yml"
+      - "./application.yml:/app/resources/application.yml"
     ports:
       - "8883:8080"
     environment:
@@ -48,7 +65,7 @@ services:
 
   dbpostgresql:
     container_name: dbpostgresql
-    image: postgres
+    image: postgres:12.4-alpine
     ports:
       - '5432:5432'
     environment:
-- 
cgit 1.2.3-korg