Merged in docker-best-practices (pull request #89)

Docker best practices

Approved-by: Adam Brokes
This commit is contained in:
Steve Smith 2021-04-15 01:27:08 +00:00
commit 273d11c686
2 changed files with 7 additions and 1 deletions

View File

@ -1,6 +1,9 @@
ARG BASE_IMAGE=adoptopenjdk:11-hotspot
FROM $BASE_IMAGE
LABEL maintainer="dc-deployments@atlassian.com"
LABEL securitytxt="https://www.atlassian.com/.well-known/security.txt"
ENV RUN_USER confluence
ENV RUN_GROUP confluence
ENV RUN_UID 2002
@ -21,7 +24,7 @@ EXPOSE 8091
CMD ["/entrypoint.py"]
ENTRYPOINT ["/usr/bin/tini", "--"]
RUN apt-get update && apt-get upgrade -y \
RUN apt-get update \
&& 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/*

View File

@ -1,6 +1,9 @@
ARG BASE_IMAGE=adoptopenjdk/openjdk8:alpine
FROM $BASE_IMAGE
LABEL maintainer="dc-deployments@atlassian.com"
LABEL securitytxt="https://www.atlassian.com/.well-known/security.txt"
ENV RUN_USER confluence
ENV RUN_GROUP confluence
ENV RUN_UID 2002