diff options
| author |   Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-03-20 17:15:25 -0400 |
|---|---|---|
| committer | Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-03-23 11:44:23 -0400 |
| commit | 4ee8967d2429a8ff633693dd35f39eb26c022816 (patch) | |
| tree | 98db22e86d24dde967d2988d1f577306faa39445 /deliveries/docker-compose.yml | |
| parent | dd5350525356a73410e0619b2e25722dd932f893 (diff) | |
Docker changes and Music Integration
Issue-ID: PORTAL-136, PORTAL-155, PORTAL-210,PORTAL-217
Includes JUNITS and docker changes, music integration and security fixes
Change-Id: Ib974401b48efc1f0d4f98036b0028043c3283691
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com>
Diffstat (limited to 'deliveries/docker-compose.yml')
| -rw-r--r-- | deliveries/docker-compose.yml | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/deliveries/docker-compose.yml b/deliveries/docker-compose.yml index 4e5879e7..29a2cce6 100644 --- a/deliveries/docker-compose.yml +++ b/deliveries/docker-compose.yml @@ -38,6 +38,41 @@ services: test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ] timeout: 10s retries: 30 + + # Config files may use hostname "portal-cassandra" + portal-cassandra: + image: ${CDR_IMG_NAME}:${PORTAL_TAG} + environment: + - CASSUSER=root + - CASSPASS=Aa123456 + expose: + - 7000 + - 7001 + - 7199 + - 9042 + - 9160 + ports: + - 7000:7000 + - 7001:7001 + - 7199:7199 + - 9042:9042 + - 9160:9160 + volumes: + - ./portal.cql:/docker-entrypoint-initdb.d/zzz_portal.cql + - ./portalsdk.cql:/docker-entrypoint-initdb.d/zzz_portalsdk.cql + links: + - portal-db + depends_on: + portal-db: + condition: service_healthy + + # Config files may use hostname "portal-zk" + portal-zk: + image: ${ZK_IMG_NAME}:${PORTAL_TAG} + expose: + - 2181 + ports: + - 2181:2181 # The app config file uses the docker name above portal-wms: @@ -75,6 +110,7 @@ services: - ${PROPS_DIR}/ONAPPORTAL/system.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/conf/system.properties - ${PROPS_DIR}/ONAPPORTAL/fusion.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/fusion/conf/fusion.properties - ${PROPS_DIR}/ONAPPORTAL/portal.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/portal.properties + - ${PROPS_DIR}/ONAPPORTAL/music.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/music.properties - ${PROPS_DIR}/ONAPPORTAL/openid-connect.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/openid-connect.properties - ${PROPS_DIR}/ONAPPORTAL/logback.xml:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/logback.xml - ${LOGS_DIR}:/opt/apache-tomcat-8.0.37/logs @@ -102,6 +138,7 @@ services: - ${PROPS_DIR}/ONAPPORTALSDK/fusion.properties:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/fusion/conf/fusion.properties - ${PROPS_DIR}/ONAPPORTALSDK/system.properties:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/conf/system.properties - ${PROPS_DIR}/ONAPPORTALSDK/portal.properties:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/classes/portal.properties + - ${PROPS_DIR}/ONAPPORTALSDK/music.properties:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/classes/music.properties - ${PROPS_DIR}/ONAPPORTALSDK/logback.xml:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/classes/logback.xml - ${LOGS_DIR}:/opt/apache-tomcat-8.0.37/logs command: |