Merge branch 'dev' of https://git.verdnatura.es/salix into dev

* 'dev' of https://git.verdnatura.es/salix:
  Docker
This commit is contained in:
Carlos 2017-11-09 09:50:10 +01:00
commit a5fe183302
1 changed files with 6 additions and 6 deletions

View File

@ -90,9 +90,9 @@ services:
depends_on: depends_on:
- route - route
links: links:
- "${BRANCH_NAME}-auth:auth" - "auth:${BRANCH_NAME}-auth"
- "${BRANCH_NAME}-salix:salix" - "salix:${BRANCH_NAME}-salix"
- "${BRANCH_NAME}-client:client" - "client:${BRANCH_NAME}-client"
- "${BRANCH_NAME}-mailer:mailer" - "mailer:${BRANCH_NAME}-mailer"
- "${BRANCH_NAME}-production:production" - "production:${BRANCH_NAME}-production"
- "${BRANCH_NAME}-route:route" - "route:${BRANCH_NAME}-route"