diff options
| author |   Manoop Talasila <talasila@research.att.com> | 2017-09-07 17:45:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-07 17:45:09 +0000 |
| commit | 97204a4b7456d021bcc4d030f3b41eedb7c89e61 (patch) | |
| tree | 7b2d3898b58296f3773d738fc76409f9fe62928e | |
| parent | 6efc2f7ffffed6c8c473caeaebb26bb087a0b6cd (diff) | |
| parent | bfbe335566089f03f44b00bd18f1d3a4b0209927 (diff) | |
Merge "Add CLI deployment as part of portal"
| -rw-r--r-- | deliveries/.env | 1 | ||||
| -rw-r--r-- | deliveries/docker-compose.yml | 15 |
2 files changed, 14 insertions, 2 deletions
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 |