Skip to content

Commit

Permalink
bug #324 Fix the Docker build (pamil)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.3-dev branch.

Discussion
----------



Commits
-------

7c3761d Fix the Docker build
  • Loading branch information
pamil authored Jan 23, 2019
2 parents 29c5820 + 7c3761d commit 39da823
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
6 changes: 0 additions & 6 deletions composer.lock

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

4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
- APP_ENV=dev
- APP_DEBUG=1
- APP_SECRET=EDITME
- DATABASE_URL=mysql://sylius:nopassword@mysql/sylius_%kernel.environment%
- DATABASE_URL=mysql://sylius:nopassword@mysql/sylius
- MAILER_URL=smtp://localhost
- PHP_DATE_TIMEZONE=${PHP_DATE_TIMEZONE:-UTC}
volumes:
Expand All @@ -32,7 +32,7 @@ services:
image: percona:5.7
environment:
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-nopassword}
- MYSQL_DATABASE=sylius_${APP_ENV-dev}
- MYSQL_DATABASE=sylius
- MYSQL_USER=sylius
- MYSQL_PASSWORD=${MYSQL_PASSWORD:-nopassword}
volumes:
Expand Down

0 comments on commit 39da823

Please sign in to comment.