summaryrefslogtreecommitdiff
path: root/docker/docker-compose.yml
diff options
context:
space:
mode:
authorMichael Weimann <mail@michael-weimann.eu>2019-10-14 23:36:26 +0200
committerMichael Weimann <mail@michael-weimann.eu>2019-10-27 08:57:56 +0100
commit545eb291b6d32c613f814eefc8e80e39899b1e90 (patch)
treedf2a3794ae4248b8efee23d01981b2451ca4fa2e /docker/docker-compose.yml
parent53ce83a272c636c4eccd043f16215d7475a2d8a9 (diff)
Adds a docker dev setup
Diffstat (limited to 'docker/docker-compose.yml')
-rw-r--r--docker/docker-compose.yml20
1 files changed, 10 insertions, 10 deletions
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