summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kobert <dennis@kobert.dev>2020-01-28 16:43:55 +0000
committerDennis Kobert <dennis@kobert.dev>2020-01-28 16:43:55 +0000
commitb3f8145eb821dbc155beaecdf1d221a8b373f6f1 (patch)
tree8f00fd194c3818d2ff5a246f645cad55c468cb61
parentd6ff7b58161d80959a0880f0ddb37e3cf5ee91a0 (diff)
Configure docker container to debloy on kobert.devHEADmaster
-rw-r--r--docker/dev/docker-compose.yml2
-rw-r--r--docker/docker-compose.yml8
2 files changed, 7 insertions, 3 deletions
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
index 858d6232..8534870f 100644
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -28,7 +28,7 @@ services:
MYSQL_USER: engelsystem
MYSQL_PASSWORD: engelsystem
MYSQL_DATABASE: engelsystem
- PHP_IDE_CONFIG: serverName=engelsystem
+ PHP_IDE_CONFIG: serverName=kobert.dev
ENVIRONMENT: development
MAIL_DRIVER: log
APP_NAME: Engelsystem DEV
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 47b85d56..ff3688ba 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,15 +2,16 @@ version: "3.6"
services:
es_nginx:
image: es_nginx
+ container_name: engelsystem
build:
context: ..
dockerfile: docker/nginx/Dockerfile
- ports:
- - 5000:80
networks:
+ - hostnet
- internal
depends_on:
- es_php_fpm
+ restart: unless-stopped
es_php_fpm:
image: es_php_fpm
build:
@@ -44,3 +45,6 @@ volumes:
networks:
internal:
database:
+ hostnet:
+ external: true
+ name: frontend