diff --git a/confluence/6.10.0/Dockerfile b/confluence/6.10.0/Dockerfile index 908951a15..f1afe7678 100644 --- a/confluence/6.10.0/Dockerfile +++ b/confluence/6.10.0/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.10.0 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.10.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.10.1/Dockerfile b/confluence/6.10.1/Dockerfile index c0b542852..bbb6fc614 100644 --- a/confluence/6.10.1/Dockerfile +++ b/confluence/6.10.1/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.10.1 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.10.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.10.2/Dockerfile b/confluence/6.10.2/Dockerfile index 8b2b131db..862582038 100644 --- a/confluence/6.10.2/Dockerfile +++ b/confluence/6.10.2/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.10.2 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.10.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.11.0/Dockerfile b/confluence/6.11.0/Dockerfile index 822803272..efd2d7f92 100644 --- a/confluence/6.11.0/Dockerfile +++ b/confluence/6.11.0/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.11.0 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.11.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.11.1/Dockerfile b/confluence/6.11.1/Dockerfile index e317e45c9..4e3a61d01 100644 --- a/confluence/6.11.1/Dockerfile +++ b/confluence/6.11.1/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.11.1 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.11.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.11.2/Dockerfile b/confluence/6.11.2/Dockerfile index c8d1ca3ba..a5dd1630f 100644 --- a/confluence/6.11.2/Dockerfile +++ b/confluence/6.11.2/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.11.2 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.11.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.12.0/Dockerfile b/confluence/6.12.0/Dockerfile index e70f6000d..515716af1 100644 --- a/confluence/6.12.0/Dockerfile +++ b/confluence/6.12.0/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.12.0 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -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 - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.12.1/Dockerfile b/confluence/6.12.1/Dockerfile index 493f47b80..91f5ca282 100644 --- a/confluence/6.12.1/Dockerfile +++ b/confluence/6.12.1/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.12.1 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.12.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.12.2/Dockerfile b/confluence/6.12.2/Dockerfile index 4c0a934f2..a6f0f0c74 100644 --- a/confluence/6.12.2/Dockerfile +++ b/confluence/6.12.2/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.12.2 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.12.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.12.3/Dockerfile b/confluence/6.12.3/Dockerfile index 0595f61da..3b234f8ea 100644 --- a/confluence/6.12.3/Dockerfile +++ b/confluence/6.12.3/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.12.3 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.12.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.12.4/Dockerfile b/confluence/6.12.4/Dockerfile index 21b1c3629..441d82a50 100644 --- a/confluence/6.12.4/Dockerfile +++ b/confluence/6.12.4/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.12.4 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.12.4 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.13.0/Dockerfile b/confluence/6.13.0/Dockerfile index 2eda97f98..b1a41e1d1 100644 --- a/confluence/6.13.0/Dockerfile +++ b/confluence/6.13.0/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.13.0 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.13.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.13.1/Dockerfile b/confluence/6.13.1/Dockerfile index 6c6c83eb5..bd4df3634 100644 --- a/confluence/6.13.1/Dockerfile +++ b/confluence/6.13.1/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.13.1 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.13.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.13.2/Dockerfile b/confluence/6.13.2/Dockerfile index 0181c9f90..491fc3627 100644 --- a/confluence/6.13.2/Dockerfile +++ b/confluence/6.13.2/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.13.2 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.13.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.13.3/Dockerfile b/confluence/6.13.3/Dockerfile index e59e04ab6..cbd126655 100644 --- a/confluence/6.13.3/Dockerfile +++ b/confluence/6.13.3/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.13.3 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.13.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.14.0/Dockerfile b/confluence/6.14.0/Dockerfile index d902248d3..7c9be0bab 100644 --- a/confluence/6.14.0/Dockerfile +++ b/confluence/6.14.0/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.14.0 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.14.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.14.1/Dockerfile b/confluence/6.14.1/Dockerfile index 68d4ac5b5..e5de2f9fc 100644 --- a/confluence/6.14.1/Dockerfile +++ b/confluence/6.14.1/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.14.1 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.14.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.14.2/Dockerfile b/confluence/6.14.2/Dockerfile index b176ac757..196c67177 100644 --- a/confluence/6.14.2/Dockerfile +++ b/confluence/6.14.2/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.14.2 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.14.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.14.3/Dockerfile b/confluence/6.14.3/Dockerfile index 4f02a35af..9a6b58967 100644 --- a/confluence/6.14.3/Dockerfile +++ b/confluence/6.14.3/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.14.3 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.14.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.15.1/Dockerfile b/confluence/6.15.1/Dockerfile index 2fa04ed41..2fa5c0ff3 100644 --- a/confluence/6.15.1/Dockerfile +++ b/confluence/6.15.1/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.15.1 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.15.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.15.2/Dockerfile b/confluence/6.15.2/Dockerfile index 7ef39a27c..4c9d5f4f3 100644 --- a/confluence/6.15.2/Dockerfile +++ b/confluence/6.15.2/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.15.2 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.15.2 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.15.4/Dockerfile b/confluence/6.15.4/Dockerfile index e65303478..8448b9c83 100644 --- a/confluence/6.15.4/Dockerfile +++ b/confluence/6.15.4/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.15.4 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.15.4 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.15.6/Dockerfile b/confluence/6.15.6/Dockerfile index 052494e04..c59edf6ee 100644 --- a/confluence/6.15.6/Dockerfile +++ b/confluence/6.15.6/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.15.6 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.15.6 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.15.7/Dockerfile b/confluence/6.15.7/Dockerfile index 588fef95b..96f818204 100644 --- a/confluence/6.15.7/Dockerfile +++ b/confluence/6.15.7/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.15.7 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.15.7 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.15.8/Dockerfile b/confluence/6.15.8/Dockerfile index 6fba506b9..2d0e14cf5 100644 --- a/confluence/6.15.8/Dockerfile +++ b/confluence/6.15.8/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.15.8 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.15.8 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.9.0/Dockerfile b/confluence/6.9.0/Dockerfile index 1698e4af4..d44e917af 100644 --- a/confluence/6.9.0/Dockerfile +++ b/confluence/6.9.0/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.9.0 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.9.0 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.9.1/Dockerfile b/confluence/6.9.1/Dockerfile index 3bb7c248e..34d709a12 100644 --- a/confluence/6.9.1/Dockerfile +++ b/confluence/6.9.1/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.9.1 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.9.1 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp diff --git a/confluence/6.9.3/Dockerfile b/confluence/6.9.3/Dockerfile index 19c5bc6ae..5d5f9043c 100644 --- a/confluence/6.9.3/Dockerfile +++ b/confluence/6.9.3/Dockerfile @@ -1,6 +1,16 @@ -FROM debian:buster -MAINTAINER Atlassian Confluence Server Team +FROM epicmorg/prod +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# ARGuments +################################################################## +ARG CONFLUENCE_VERSION=6.9.3 +ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## ENV RUN_USER daemon ENV RUN_GROUP daemon @@ -8,23 +18,6 @@ ENV RUN_GROUP daemon ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence -ENV DEBIAN_FRONTEND noninteractive - -#editing sources list -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -COPY locale.gen /etc/locale.gen - -#installing utils -# https://confluence.atlassian.com/confkb/update-the-confluence-docker-image-to-use-oracle-jdk-829062521.html -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections -RUN apt-get update && apt-get install -y --allow-unauthenticated gnupg2 ca-certificates htop mc tmux iftop cmatrix iputils-ping cmatrix-xfont lsof lynx gnupg sudo apt-transport-https lsb-release apt-utils locales console-cyrillic wget curl bash procps openssl perl ttf-dejavu tini util-linux fontconfig - -#installing java -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 -RUN echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list -RUN apt-get update && apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - VOLUME ["${CONFLUENCE_HOME}"] WORKDIR $CONFLUENCE_HOME @@ -32,28 +25,22 @@ WORKDIR $CONFLUENCE_HOME EXPOSE 8090 EXPOSE 8091 -CMD ["/entrypoint.sh", "-fg"] -ENTRYPOINT ["/usr/bin/tini", "--"] - -COPY entrypoint.sh /entrypoint.sh - -#After install fixes -RUN localedef en_US.UTF-8 -i en_US -f UTF-8 -RUN update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 -RUN apt update -RUN apt upgrade -y -RUN apt dist-upgrade -y -RUN apt-get clean autoclean -RUN apt-get autoremove -y -RUN rm -rf /var/lib/apt/lists/* - -ARG CONFLUENCE_VERSION=6.9.3 -ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz - -COPY . /tmp - +################################################################## +# Installing +################################################################## RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \ - && curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \ + && curl -L ${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 + && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb + +CMD ["/entrypoint.sh", "-fg"] +ENTRYPOINT ["/usr/bin/tini", "--"] +COPY entrypoint.sh /entrypoint.sh +COPY . /tmp