mirror of
https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git
synced 2024-08-30 18:22:16 +00:00
Set -Dconfluence.home from environment variable
This commit is contained in:
parent
afdc6e9ff0
commit
ca78534396
@ -1,10 +1,10 @@
|
|||||||
FROM openjdk:8u121-alpine
|
FROM openjdk:8u121-alpine
|
||||||
MAINTAINER Dave Chevell
|
MAINTAINER Atlassian Confluence
|
||||||
|
|
||||||
ENV RUN_USER daemon
|
ENV RUN_USER daemon
|
||||||
ENV RUN_GROUP daemon
|
ENV RUN_GROUP daemon
|
||||||
|
|
||||||
# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files
|
# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
|
||||||
ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
|
ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
|
||||||
ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
|
ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
|
||||||
|
|
||||||
@ -34,5 +34,5 @@ COPY . /tmp
|
|||||||
RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
|
RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
|
||||||
&& curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
|
&& curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
|
||||||
&& chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \
|
&& chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \
|
||||||
&& sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
|
&& sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
|
||||||
&& sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml
|
&& sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml
|
Loading…
Reference in New Issue
Block a user