Skip to content

Commit

Permalink
Merge pull request laradock#491 from laradock/bug
Browse files Browse the repository at this point in the history
fix laradock#490 duplication of key "volumes"
  • Loading branch information
appleboy authored Dec 16, 2016
2 parents 047e7f7 + 380eef5 commit e9d3a83
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -262,14 +262,12 @@ services:

caddy:
build: ./caddy
volumes_from:
- applications
volumes:
- caddy:/root/.caddy
ports:
- "80:80"
- "443:443"
- "2015:2015"
volumes_from:
- applications
volumes:
- ./caddy/Caddyfile:/etc/Caddyfile
- ./logs/caddy:/var/log/caddy
Expand Down

0 comments on commit e9d3a83

Please sign in to comment.