From: Manoop Talasila <talasila@research.att.com>
Date: Thu, 7 Sep 2017 17:45:09 +0000 (+0000)
Subject: Merge "Add CLI deployment as part of portal"
X-Git-Tag: v1.3.0~32
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=97204a4b7456d021bcc4d030f3b41eedb7c89e61;hp=6efc2f7ffffed6c8c473caeaebb26bb087a0b6cd;p=portal.git

Merge "Add CLI deployment as part of portal"
---

diff --git a/deliveries/.env b/deliveries/.env
index fa307685..eb7f33ca 100644
--- a/deliveries/.env
+++ b/deliveries/.env
@@ -11,6 +11,7 @@ WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps
 EP_IMG_NAME=portal-apps
 DB_IMG_NAME=portal-db
 WMS_IMG_NAME=portal-wms
+
 # Tag all images with this
 PORTAL_TAG=1.1.0
 
diff --git a/deliveries/docker-compose.yml b/deliveries/docker-compose.yml
index 1ea2bb67..ec8fd7b8 100644
--- a/deliveries/docker-compose.yml
+++ b/deliveries/docker-compose.yml
@@ -7,6 +7,17 @@ version: '2.0'
 
 services:
 
+  cli:
+    image: onap/cli:${PORTAL_TAG}
+    environment:
+      MODE: 'deamon'
+    expose:
+      - 80
+    ports:
+      - 8080:80
+    logging:
+      driver: json-file
+
   # Config files may use hostname "portal-db"
   portal-db:
     image: ${DB_IMG_NAME}:${PORTAL_TAG}
@@ -21,7 +32,7 @@ services:
       driver: json-file
 
   # An environment variable here CAN override the database URL;
-  # instead the value in the config file uses hostname from above 
+  # instead the value in the config file uses hostname from above
   portal-wms:
     image: ${WMS_IMG_NAME}:${PORTAL_TAG}
     expose:
@@ -71,7 +82,7 @@ services:
       - ${PROJECT_DIR}/etc/ECOMPDBCAPP/portal.properties:${WEBAPPS_DIR}/ECOMPDBCAPP/WEB-INF/classes/portal.properties
       - ${PROJECT_DIR}/etc/ECOMPDBCAPP/dbcapp.properties:${WEBAPPS_DIR}/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties
       - ${PROJECT_DIR}/etc/ECOMPDBCAPP/fusion.properties:${WEBAPPS_DIR}/ECOMPDBCAPP/WEB-INF/fusion/conf/fusion.properties
-      - ${PROJECT_DIR}/portal-apps-logs:/opt/apache-tomcat-8.0.37/logs 
+      - ${PROJECT_DIR}/portal-apps-logs:/opt/apache-tomcat-8.0.37/logs
     command:
       - /wait-for.sh
       - -t