Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged in DCD-1119-disable-file-log (pull request #75)

Browse Source 
DCD-1119: Stop sending application logs to file

* DCD-1119: Stop sending application logs to file

* DCD-1119: Add variable and document it

Approved-by: Kenny MacLeod
Approved-by: Dave Chevell
This commit is contained in:
Adam Brokes 2020-11-11 22:30:32 +00:00
parent 1045386ac9
commit 9e2de19c41
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -10,6 +10,8 @@ ENV RUN_GID 2002
ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
ENV CONFLUENCE_LOG_STDOUT true
WORKDIR $CONFLUENCE_HOME
# Expose HTTP and Synchrony ports
@ -41,7 +43,7 @@ RUN groupadd --gid ${RUN_GID} ${RUN_GROUP} \
\
&& sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
&& sed -i -e 's/-XX:ReservedCodeCacheSize=\([0-9]\+[kmg]\)/-XX:ReservedCodeCacheSize=${JVM_RESERVED_CODE_CACHE_SIZE:=\1}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
&& sed -i -e 's/export CATALINA_OPTS/CATALINA_OPTS="\${CATALINA_OPTS} \${JVM_SUPPORT_RECOMMENDED_ARGS}"\n\nexport CATALINA_OPTS/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
&& sed -i -e 's/export CATALINA_OPTS/CATALINA_OPTS="\${CATALINA_OPTS} \${JVM_SUPPORT_RECOMMENDED_ARGS} -DConfluenceHomeLogAppender.disabled=${CONFLUENCE_LOG_STDOUT}"\n\nexport CATALINA_OPTS/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
\
&& mkdir -p /opt/java/openjdk/lib/fonts/fallback/ \
&& ln -sf /usr/share/fonts/truetype/noto/* /opt/java/openjdk/lib/fonts/fallback/

6
README.md
View File

@ -165,6 +165,12 @@ Example:
The Confluence license string. Providing this will remove the need to supply it through the web startup screen.
* `CONFLUENCE_LOG_STDOUT` (from Confluence 7.9 onwards) `[true, false]`
Prior to Confluence version 7.9.0, the log files are stored in the `logs` folder in Confluence home. From version
7.9.0, the logs are printed to the `stdout` by default. This makes it possible to fetch the log messages
via `docker logs <CONTAINER_ID>`. You can revert to log into the `logs` folder by setting this variable to `true`.
## Database configuration
It is optionally possible to configure the database from the environment,