From fa86224f538741f5a529f179cb8a63321f96d985 Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Fri, 20 Oct 2017 16:36:54 +1100 Subject: 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 Reviewed-by: Stephen Finucane --- docker-compose.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'docker-compose.yml') 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 -- cgit v1.2.3