Removed redundany packages and tidied up formatting

This commit is contained in:
Dave Chevell 2019-02-01 10:58:52 +11:00
parent 5fdad0eaea
commit 3dec230cd6
No known key found for this signature in database
GPG Key ID: 279DF1B52C7C44DC

View File

@ -1,5 +1,4 @@
FROM adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u192-b12
MAINTAINER Atlassian Confluence
FROM adoptopenjdk/openjdk8:slim
ENV RUN_USER daemon
ENV RUN_GROUP daemon
@ -9,28 +8,30 @@ ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
VOLUME ["${CONFLUENCE_HOME}"]
WORKDIR $CONFLUENCE_HOME
# Expose HTTP and Synchrony ports
EXPOSE 8090
EXPOSE 8091
WORKDIR $CONFLUENCE_HOME
CMD ["/entrypoint.sh", "-fg"]
ENTRYPOINT ["/sbin/tini", "--"]
ENTRYPOINT ["/tini", "--"]
RUN apt-get update && apt-get install -y wget curl bash procps perl fontconfig && apt-get clean -y && apt-get autoremove -y
RUN wget https://github.com/krallin/tini/releases/download/v0.18.0/tini -O /sbin/tini && chmod a+x /sbin/tini
RUN apt-get update \
&& apt-get install -y --no-install-recommends fontconfig \
&& apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
ARG TINI_VERSION=v0.18.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
RUN chmod +x /tini
COPY entrypoint.sh /entrypoint.sh
ARG CONFLUENCE_VERSION=6.3.3
ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
COPY . /tmp
ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/confluence/downloads/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
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}/ \
&& 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 \