From 9bce3c81c6f38191042bfaba765ee3a8a7fda839 Mon Sep 17 00:00:00 2001 From: STAM Date: Fri, 5 Oct 2018 15:23:26 +0300 Subject: [PATCH] CONFLUENCE_VERSION=6.12.0 --- confluence/latest/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confluence/latest/Dockerfile b/confluence/latest/Dockerfile index fc29fdbe9..7ca175078 100644 --- a/confluence/latest/Dockerfile +++ b/confluence/latest/Dockerfile @@ -35,7 +35,7 @@ RUN apk update -qq \ COPY entrypoint.sh /entrypoint.sh -ARG CONFLUENCE_VERSION=6.11.2 +ARG CONFLUENCE_VERSION=6.12.0 ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz COPY . /tmp @@ -44,4 +44,4 @@ RUN mkdir -p ${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}/ \ && 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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml