From e76a8324fb9cc5b43d51e51ba703d27517d10c2c Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Thu, 15 Sep 2016 18:55:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BC=20?= =?UTF-8?q?=D1=81=D0=B5=D1=82=D1=8C=20=D0=B4=D0=BB=D1=8F=20=D1=81=D1=83?= =?UTF-8?q?=D0=BF=D0=BF=D0=BE=D1=80=D1=82=20nginx-proxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 773afd9..530402d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,9 @@ services: volumes: - ./:/var/www/html/ env_file: .env + networks: + - default + - nginx-proxy web: build: ./docker/nginx @@ -19,8 +22,12 @@ services: volumes_from: - app environment: - - AUTHSERVER_HOST=authserver.ely.by + - AUTHSERVER_HOST=authserver.ely.by.local - PHP_LINK=app + - VIRTUAL_HOST=account.ely.by.local,authserver.ely.by.local + networks: + - default + - nginx-proxy node-dev-server: build: ./frontend @@ -35,7 +42,7 @@ services: build: . volumes: - ./:/var/www/html/ - command: ./docker/wait-for-it.sh rabbitmq:5672 -- ./yii account-queue + command: ["./docker/wait-for-it.sh", "rabbitmq:5672", "--", "./yii account-queue"] links: - db - redis @@ -72,3 +79,8 @@ services: - "8181:80" links: - db + +networks: + nginx-proxy: + external: + name: nginx-proxy