diff options
| author |   Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2017-08-30 09:33:23 +0530 |
|---|---|---|
| committer | Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2017-09-07 19:00:00 +0530 |
| commit | bfbe335566089f03f44b00bd18f1d3a4b0209927 (patch) | |
| tree | 2a14b9c38a7d0d7b4b5837a296131dfe3e84a144 | |
| parent | 19f3f4a23a4b015b2a4091b42daa632bfa078d6b (diff) | |
Add CLI deployment as part of portal
CLI is available as onap/cli docker image
and is enabled to get installed as part of
portal vm
CLI-14
Change-Id: Ia1035a934f9808d76a78415462677708017eaea8
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
| -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 |