Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged in native-tini (pull request #74)

Browse Source 
Install tini via package manager

Approved-by: Steve Smith
This commit is contained in:
Dave Chevell 2020-10-19 00:52:49 +00:00
commit e67ef33cec
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -17,16 +17,12 @@ EXPOSE 8090
EXPOSE 8091
CMD ["/entrypoint.py"]
ENTRYPOINT ["/sbin/tini", "--"]
ENTRYPOINT ["/usr/bin/tini", "--"]
RUN apt-get update && apt-get upgrade -y \
&& apt-get install -y --no-install-recommends fontconfig fonts-noto python3 python3-jinja2 \
&& apt-get install -y --no-install-recommends fontconfig fonts-noto python3 python3-jinja2 tini \
&& apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
ARG TINI_VERSION=v0.18.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
RUN chmod +x /sbin/tini
ARG CONFLUENCE_VERSION
ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/confluence/downloads/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz

2
shared-components

@ -1 +1 @@
Subproject commit e7d26879d37c695adf2e7228dd414e060706f6bf
Subproject commit 56fe6e70b19145c1257ba6048f0ad06b41d28a82