From: Manoop Talasila <talasila@research.att.com>
Date: Mon, 11 Sep 2017 17:59:58 +0000 (+0000)
Subject: Merge "Fix CLI docker env settings"
X-Git-Tag: v1.3.0~29
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4ba6a0f20a190030700917a6065a6779ca9d308f;hp=-c;p=portal.git

Merge "Fix CLI docker env settings"
---

4ba6a0f20a190030700917a6065a6779ca9d308f
diff --combined deliveries/docker-compose.yml
index 54b67078,63268e0b..2b33c8ee
--- a/deliveries/docker-compose.yml
+++ b/deliveries/docker-compose.yml
@@@ -7,13 -7,10 +7,13 @@@ 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'
+       CLI_MODE: 'daemon'
      expose:
        - 80
      ports:
@@@ -49,7 -46,7 +49,7 @@@
      command:
        - /wait-for.sh
        - -t
 -      - "60"
 +      - "180"
        - portal-db:3306
        - --
        - /start-wms-cmd.sh
@@@ -89,7 -86,7 +89,7 @@@
      command:
        - /wait-for.sh
        - -t
 -      - "60"
 +      - "180"
        - portal-db:3306
        - --
        - /start-apps-cmd.sh