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

Merge conflict fix - resetting to earlier state and manually re-applying dragfly's libc6-compat fix

Browse Source
This commit is contained in:
Dave Chevell 2017-10-19 18:12:34 +11:00
parent 5b51b21a11
commit 526e1d5113
No known key found for this signature in database
GPG Key ID: 279DF1B52C7C44DC
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -21,7 +21,7 @@ ENTRYPOINT ["/sbin/tini", "--"]
RUN apk update -qq \
&& update-ca-certificates \
&& apk add ca-certificates wget curl openssh bash procps openssl perl ttf-dejavu tini \
&& apk add ca-certificates wget curl openssh bash procps openssl perl ttf-dejavu tini libc6-compat \
&& rm -rf /var/lib/{apt,dpkg,cache,log}/ /tmp/* /var/tmp/*
COPY entrypoint.sh /entrypoint.sh