|
|
@@ -32,6 +32,7 @@ services:
|
|
|
args:
|
|
|
USER_ID: ${USER_ID}
|
|
|
GROUP_ID: ${GROUP_ID}
|
|
|
+ TOMCAT_DIR: ${TOMCAT_DIR}
|
|
|
volumes:
|
|
|
- ${LABKEY_DIR}:/usr/local/labkey
|
|
|
- ${LABKEY_FILES}:/data/labkey/files
|
|
|
@@ -41,24 +42,21 @@ services:
|
|
|
#- ${LABKEY_DIR}/pipeline-lib:/usr/local/labkey/pipeline-lib
|
|
|
#- ${LABKEY_DIR}/externalModules:/usr/local/labkey/externalModules
|
|
|
#- ${LABKEY_DIR}/files:/usr/local/labkey/files
|
|
|
- #- ${TOMCAT_DIR}:/usr/local/tomcat
|
|
|
- #- ${TOMCAT_DIR}/conf/server.xml:/usr/local/tomcat/conf/server.xml
|
|
|
- ${TOMCAT_DIR}/bin/setenv.sh:/usr/local/tomcat/bin/setenv.sh
|
|
|
- #- ${TOMCAT_DIR}/bin/setenv.sh:/usr/local/tomcat/bin/setenv.sh
|
|
|
- #- ${TOMCAT_DIR}/conf/key.pem:/usr/local/tomcat/conf/key.pem
|
|
|
- #- ${TOMCAT_DIR}/conf/cert.pem:/usr/local/tomcat/conf/cert.pem
|
|
|
- #- ${TOMCAT_DIR}/conf/ca-chain.pem:/usr/local/tomcat/conf/ca-chain.pem
|
|
|
- ${TOMCAT_DIR}/lib/labkeyBootstrap.jar:/usr/local/tomcat/lib/labkeyBootstrap.jar
|
|
|
- ${TOMCAT_DIR}/lib/javax.activation.jar:/usr/local/tomcat/lib/javax.activation.jar
|
|
|
- ${TOMCAT_DIR}/lib/mail.jar:/usr/local/tomcat/lib/mail.jar
|
|
|
- ${TOMCAT_DIR}/lib/postgresql.jar:/usr/local/tomcat/lib/postgresql.jar
|
|
|
- ${TOMCAT_DIR}/conf/Catalina/localhost/labkey.xml:/usr/local/tomcat/conf/Catalina/localhost/labkey.xml
|
|
|
+ #if one uses SSL, use the following lines to override default server.xml
|
|
|
+ - ${TOMCAT_DIR}/conf/SSL:/usr/local/tomcat/conf/SSL
|
|
|
+ - ${TOMCAT_DIR}/conf/server.xml:/usr/local/tomcat/conf/server.xml
|
|
|
ports:
|
|
|
- 8080:8080
|
|
|
- - 8444:8443
|
|
|
+ - 8443:8443
|
|
|
|
|
|
|
|
|
networks:
|
|
|
default:
|
|
|
- external:
|
|
|
- name: labkey_network
|
|
|
+ external:
|
|
|
+ name: labkey_network
|
Labkey