diff options
| author |   Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-09-25 13:59:56 -0400 |
|---|---|---|
| committer | Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-09-26 16:52:00 -0400 |
| commit | a59bc3e85eaf33c0a38063e5c30fe890588a0eb1 (patch) | |
| tree | b19ba17d5dbd6cecc0b34c0ef6b158c088746384 /deliveries/docker-compose.yml | |
| parent | 4be6886a011ddbc4543e8c27b759a27ff3415c18 (diff) | |
login and Certman AAF Integration changes
Issue-ID: PORTAL-386, PORTAL-389
failed to create user with special char in login_id
Change-Id: I415adf615a7af97319d8d11a740e75d3dfa11583
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 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/deliveries/docker-compose.yml b/deliveries/docker-compose.yml index bba42aac..77538542 100644 --- a/deliveries/docker-compose.yml +++ b/deliveries/docker-compose.yml @@ -99,6 +99,7 @@ services: - 8989:8080 - 8010:8009 - 8006:8005 + - 8443:8443 links: - portal-db - portal-wms @@ -116,7 +117,9 @@ services: - ${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 + - ./${TOMCAT_TRUST}:${TOMCAT_DIR}/${TOMCAT_TRUST} + - ./${TOMCAT_KEY}:${TOMCAT_DIR}/${TOMCAT_KEY} + - ${LOGS_DIR}:${TOMCAT_DIR}/logs command: - /start-apache-tomcat.sh # see comments in .env file @@ -128,6 +131,10 @@ services: driver: json-file environment: - CATALINA_OPTS=-Xmx1536m -Xms1536m + - javax.net.ssl.keyStore=${TOMCAT_DIR}/${TOMCAT_TRUST} + - javax.net.ssl.keyStorePassword=${CERT_PWD} + - javax.net.ssl.trustStore=${TOMCAT_DIR}/${TOMCAT_TRUST} + - javax.net.ssl.trustStorePassword=${CERT_PWD} portal-sdk: image: ${SDK_IMG_NAME}:${PORTAL_TAG} ports: @@ -146,7 +153,7 @@ services: - ${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 + - ${LOGS_DIR}:${TOMCAT_DIR}/logs command: - /start-apache-tomcat.sh logging: |