diff options
| author | Daniel Axtens <dja@axtens.net> | 2017-10-20 16:36:54 +1100 |
|---|---|---|
| committer | Daniel Axtens <dja@axtens.net> | 2017-10-28 12:39:17 +1100 |
| commit | fa86224f538741f5a529f179cb8a63321f96d985 (patch) | |
| tree | 5f6d1a03f36cb9ec5ddf21992318e4cd00ef5932 /docker-compose.yml | |
| parent | d65e805be6d99a72df92550ad38a2d1b2005724f (diff) | |
| download | patchwork-fa86224f538741f5a529f179cb8a63321f96d985.tar patchwork-fa86224f538741f5a529f179cb8a63321f96d985.tar.gz | |
Simplify docker-compose MySQL setup
This moves the config from a separate Dockerfile to something
integrated into the docker-compose.yml file.
Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Stephen Finucane <stephen@that.guru>
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 7db3486..47786ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,9 +5,14 @@ # or upgrade to v2 and use the build-arg to override it. db: - build: tools/docker/db + image: mysql:5.7 volumes: - - ./tools/docker/db/data:/var/lib/mysql + - ./tools/docker/db/data:/var/lib/mysql + environment: + - MYSQL_ROOT_PASSWORD=password + - MYSQL_USER=patchwork + - MYSQL_PASSWORD=password + web: build: . dockerfile: ./tools/docker/Dockerfile |