Skip to content
This repository has been archived by the owner on Jun 14, 2023. It is now read-only.

Commit

Permalink
updated packages, dev-environment
Browse files Browse the repository at this point in the history
  • Loading branch information
schmunk42 committed Apr 17, 2017
1 parent 9dad083 commit a80c5a8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
10 changes: 5 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:
- 21080:80
depends_on:
- db
- mailcatcher
environment:
# Database
- MYSQL_ROOT_PASSWORD=secret
Expand All @@ -28,7 +29,9 @@ services:
- APP_LANGUAGES=en,de,ru
# Development ONLY settings, DO NOT set production defaults for these values in Dockerfile
- APP_ADMIN_PASSWORD=admin1
- [email protected]
- APP_MIGRATION_LOOKUP=@app/migrations/demo-data
- DB_ENV_MYSQL_ROOT_PASSWORD=secret
volumes:
# Application source-code
- ./src/modules:/app/src/modules
Expand All @@ -38,9 +41,6 @@ services:
- ~/.composer/cache:/root/.composer/cache
- ./composer.json:/app/composer.json
- ./composer.lock:/app/composer.lock
# Debug
#- ./web/assets:/app/web/assets
#- ./runtime:/app/runtime

worker:
build: .
Expand All @@ -54,3 +54,8 @@ services:
- MYSQL_ROOT_PASSWORD=secret
ports:
- '3306'

mailcatcher:
image: nisenabe/mailcatcher
ports:
- '1080'
5 changes: 4 additions & 1 deletion docker-compose.override-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ services:
php:
volumes:
# Application packages
#- ./vendor:/app/vendor
#- ./vendor:/app/vendor
# Debug
#- ./web/assets:/app/web/assets
#- ./runtime:/app/runtime

0 comments on commit a80c5a8

Please sign in to comment.