ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

incorporate upstream changes.

This commit is contained in:
Eric Pfeiffer 2016-07-19 22:01:20 -05:00
parent 9b084433c3
commit 9e7a669d5b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caddy/Dockerfile
View File

@ -3,7 +3,9 @@ MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
LABEL caddy_version="0.9.0" architecture="amd64" LABEL caddy_version="0.9.0" architecture="amd64"
RUN apk add --update openssh-client tar curl RUN apk update \
&& apk upgrade \
&& apk add tar curl
RUN curl --silent --show-error --fail --location \ RUN curl --silent --show-error --fail --location \
--header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \ --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \

2
docker-compose.yml
View File

@ -167,7 +167,7 @@ services:
caddy: caddy:
build: ./caddy build: ./caddy
volumes_from: volumes_from:
- application - volumes_source
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"