chore: forgot to pull, need to merge

This commit is contained in:
Jan Christian Grünhage 2018-08-09 08:17:52 +02:00
parent 7431af5d95
commit 484ee2c740
1 changed files with 8 additions and 2 deletions

View File

@ -1,5 +1,11 @@
FROM docker.jcg.re/base-caddy
RUN apk add --no-cache bash
FROM docker.io/matrixdotorg/base-caddy
ENV UID=1337 \
GID=1337
RUN apk add --no-cache \
su-exec \
s6 \
bash
ADD root /
EXPOSE 2015 80 443
VOLUME ["/etc/caddy", "/var/www"]
CMD ["/bin/s6-svscan", "/etc/s6.d/"]