From 545eb291b6d32c613f814eefc8e80e39899b1e90 Mon Sep 17 00:00:00 2001 From: Michael Weimann Date: Mon, 14 Oct 2019 23:36:26 +0200 Subject: Adds a docker dev setup --- docker/docker-compose.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docker/docker-compose.yml') diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index f4be4eb2..47b85d56 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,23 +1,23 @@ version: "3.6" services: - nginx: - image: engelsystem-nginx + es_nginx: + image: es_nginx build: context: .. - dockerfile: "" + dockerfile: docker/nginx/Dockerfile ports: - 5000:80 networks: - internal depends_on: - - engelsystem - engelsystem: - image: engelsystem + - es_php_fpm + es_php_fpm: + image: es_php_fpm build: context: .. - dockerfile: "" + dockerfile: docker/Dockerfile environment: - MYSQL_HOST: database + MYSQL_HOST: es_database MYSQL_USER: engelsystem MYSQL_PASSWORD: engelsystem MYSQL_DATABASE: engelsystem @@ -25,8 +25,8 @@ services: - internal - database depends_on: - - database - database: + - es_database + es_database: image: mariadb:10.2 environment: MYSQL_DATABASE: engelsystem -- cgit v1.2.3-54-g00ecf