Repair search and timeout defects

[portal.git] / deliveries / docker-compose.yml

diff --git a/deliveries/docker-compose.yml b/deliveries/docker-compose.yml
index 1ea2bb6..54b6707 100644 (file)
--- a/deliveries/docker-compose.yml
+++ b/deliveries/docker-compose.yml
@@ -7,6 +7,20 @@ version: '2.0'
 
 services:
 
+  # Available from ONAP Nexus repository:
+  # docker login -u USER -p PASS nexus3.onap.org:10001
+  # docker pull nexus3.onap.org:10001/onap/cli:1.1-STAGING-latest
+  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 +35,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:
@@ -35,7 +49,7 @@ services:
     command:
       - /wait-for.sh
       - -t
-      - "60"
+      - "180"
       - portal-db:3306
       - --
       - /start-wms-cmd.sh
@@ -71,11 +85,11 @@ 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
-      - "60"
+      - "180"
       - portal-db:3306
       - --
       - /start-apps-cmd.sh