From 1d4952cf53155836448510e9a8a3d606b8269325 Mon Sep 17 00:00:00 2001 From: jxie Date: Thu, 9 Nov 2017 17:33:09 +1100 Subject: [PATCH] Revert "add the shared home dir" This reverts commit 2bce44d24a9bdb2bf061f9f6da1666ad2e96c9aa. --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 613dc0c..e7d0f10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ No newline at end of file