Merge pull request #491 from laradock/bug

fix #490 duplication of key "volumes"
This commit is contained in:
Bo-Yi Wu 2016-12-16 17:23:01 +08:00 committed by GitHub
commit e9d3a838f1

View File

@ -262,14 +262,12 @@ services:
caddy: caddy:
build: ./caddy build: ./caddy
volumes_from:
- applications
volumes:
- caddy:/root/.caddy
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
- "2015:2015" - "2015:2015"
volumes_from:
- applications
volumes: volumes:
- ./caddy/Caddyfile:/etc/Caddyfile - ./caddy/Caddyfile:/etc/Caddyfile
- ./logs/caddy:/var/log/caddy - ./logs/caddy:/var/log/caddy