Skip to content

Commit e1b44b8

Browse files
authored
24.11 fb change log folder (#761)
* Replacing location of LabKey log files outside the docker container * removing some commented files
1 parent 45f04a5 commit e1b44b8

2 files changed

Lines changed: 2 additions & 11 deletions

File tree

docker/development/compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
image: wnprcehr/labkey${LK_PROD}:$LK_VERSION${LK_FB}
99
volumes:
1010
- "${LK_FILES_DIR}:/backups/new_files_dir"
11-
- "${LK_LOG_DIR}:/usr/local/tomcat/logs"
11+
- "${LK_LOG_DIR}:/labkey/logs"
1212
- "${LK_MODULE_DEPLOY_DIR}:/usr/local/modules"
1313
- "${LK_SESSION_DIR}:/usr/local/labkey/sessions"
1414
expose:

docker/labkey/Dockerfile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,6 @@ RUN chown -Rc labkey:labkey ${LABKEY_HOME}
6161

6262
EXPOSE 8080
6363

64-
#USER labkey
65-
#CMD ["/bin/bash", "-c", "ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && envsubst < /root/netrc.template > /root/.netrc && chmod 600 /root/.netrc && { \\cp -f /usr/local/modules/*.module /usr/local/labkey/modules/ &>/dev/null ; /etc/replacingSecrets.sh && systemctl daemon-reload && systemctl start labkey_server ; }"]
66-
#CMD ["/bin/bash", "-c", "ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && envsubst < /root/netrc.template > /root/.netrc && chmod 600 /root/.netrc && { \\cp -f /usr/local/modules/*.module /usr/local/labkey/modules/ &>/dev/null ;}", "java", "-jar", "labkeyServer.jar"]
67-
#CMD ["/bin/bash", "-c", "ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && envsubst < /root/netrc.template > /root/.netrc && chmod 600 /root/.netrc && { \\cp -f /usr/local/modules/*.module /usr/local/labkey/modules/ &>/dev/null ; java -jar /labkey/labkeyServer.jar;}"]
6864
ENTRYPOINT ["/etc/replacingSecrets.sh" ]
6965

70-
#working
71-
#CMD ["java", "-XX:MaxRAMPercentage=75.0", "-Dlabkey.home=$LABKEY_HOME" , "-Dlabkey.log.home=/labkey/logs", "-Dlogback.debug=true", "-jar", "/labkey/labkey/labkeyServer.jar"]
72-
CMD java -XX:+HeapDumpOnOutOfMemoryError -XX:MaxRAMPercentage=75.0 -Dlabkey.home=$LABKEY_HOME -Dlabkey.log.home=$LABKEY_LOGS -Dlogback.debug=true -jar /labkey/labkey/labkeyServer.jar
73-
#ENTRYPOINT ["/bin/bash", "-c", "ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && envsubst < /root/netrc.template > /root/.netrc && chmod 600 /root/.netrc && { \\cp -f /usr/local/modules/*.module /usr/local/labkey/modules/ &>/dev/null ; /etc/replacingSecrets.sh; }" ]
74-
75-
#CMD ["sudo","-u","labkey","java","-XX:MaxRAMPercentage=75.0", "-Dlabkey.home=$LABKEY_HOME" , "-Dlabkey.log.home=/labkey/logs", "-Dlogback.debug=true", "-jar", "/labkey/labkeyServer.jar"]
66+
CMD java -XX:+HeapDumpOnOutOfMemoryError -XX:MaxRAMPercentage=75.0 -Dlabkey.home=$LABKEY_HOME -Dlabkey.log.home=$LABKEY_LOGS -Dlogback.debug=true -jar /labkey/labkey/labkeyServer.jar

0 commit comments

Comments
 (0)