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

DCD-1271: Re-add package upgrades and add corresponding linting override.

Browse Source
This commit is contained in:
Steve Smith 2021-04-15 16:37:47 +10:00
parent c8a86e38a3
commit 302c23d2b1
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hadolint.yaml
View File

@ -1,4 +1,6 @@
ignored: ignored:
- DL3005 # Package upgrades
- DL3017 # Package upgrades
- DL3006 # Version tagging - DL3006 # Version tagging
- DL3008 # Pinning - DL3008 # Pinning
- DL3018 # Pinning - DL3018 # Pinning

1
Dockerfile
View File

@ -25,6 +25,7 @@ CMD ["/entrypoint.py"]
ENTRYPOINT ["/usr/bin/tini", "--"] ENTRYPOINT ["/usr/bin/tini", "--"]
RUN apt-get update \ RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y --no-install-recommends fontconfig fonts-noto python3 python3-jinja2 tini \ && 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/* && apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*

1
Dockerfile-alpine
View File

@ -23,6 +23,7 @@ CMD ["/entrypoint.py"]
ENTRYPOINT ["/sbin/tini", "--"] ENTRYPOINT ["/sbin/tini", "--"]
RUN apk update \ RUN apk update \
&& apk upgrade \
&& apk add --no-cache ca-certificates wget curl openssh bash procps openssl perl tini python3 py3-jinja2 ttf-dejavu `apk search -qe 'font-noto*'` \ && apk add --no-cache ca-certificates wget curl openssh bash procps openssl perl tini python3 py3-jinja2 ttf-dejavu `apk search -qe 'font-noto*'` \
&& rm -f /var/cache/apk/APKINDEX* && rm -f /var/cache/apk/APKINDEX*