|
@@ -1,5 +1,3 @@
|
|
|
-version: "3.3"
|
|
|
-
|
|
|
services:
|
|
|
|
|
|
labkey-db:
|
|
@@ -17,6 +15,8 @@ services:
|
|
|
- POSTGRES_USER=postgres
|
|
|
- POSTGRES_PASSWORD=$PGPASS
|
|
|
- POSTGRES_DB=labkey
|
|
|
+ networks:
|
|
|
+ - labkey_network
|
|
|
ports:
|
|
|
- 5432
|
|
|
|
|
@@ -32,18 +32,26 @@ services:
|
|
|
args:
|
|
|
USER_ID: ${USER_ID}
|
|
|
GROUP_ID: ${GROUP_ID}
|
|
|
+
|
|
|
volumes:
|
|
|
- ${LABKEY_DIR}:/usr/local/labkey
|
|
|
+ - ${LABKEY_FILES}:/data/labkey/files
|
|
|
+ - ${EXTERNAL_MODULES}:/usr/local/labkey/externalModules
|
|
|
- ${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}/conf/Catalina/localhost/labkey.xml:/usr/local/tomcat/conf/Catalina/localhost/labkey.xml
|
|
|
+ - ${TOMCAT_DIR}/bin/setenv.sh:/usr/local/tomcat/bin/setenv.sh
|
|
|
+ networks:
|
|
|
+ - labkey_network
|
|
|
+ - docker_network
|
|
|
ports:
|
|
|
- 8081:8080
|
|
|
- 8444:8443
|
|
|
|
|
|
|
|
|
networks:
|
|
|
- default:
|
|
|
- external:
|
|
|
- name: labkey_network
|
|
|
+ labkey_network:
|
|
|
+ external: true
|
|
|
+ docker_network:
|
|
|
+ external: true
|