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

Revert "add the shared home dir"

Browse Source 
This reverts commit 2bce44d24a.
This commit is contained in:
jxie 2017-11-09 17:33:09 +11:00
parent 2bce44d24a
commit 1d4952cf53
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -6,10 +6,9 @@ ENV RUN_GROUP daemon
# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
ENV CONFLUENCE_SHARED_HOME /var/atlassian/application-data/confluence-shared
ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
VOLUME ["${CONFLUENCE_HOME}", "${CONFLUENCE_SHARED_HOME}", "${CONFLUENCE_INSTALL_DIR}"]
VOLUME ["${CONFLUENCE_HOME}"]
# Expose HTTP and Synchrony ports
EXPOSE 8090
@ -33,11 +32,7 @@ ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/a
COPY . /tmp
RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
&& mkdir -p ${CONFLUENCE_HOME} \
&& mkdir -p ${CONFLUENCE_SHARED_HOME} \
&& 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_HOME}/ \
&& chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_SHARED_HOME}/ \
&& 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