From f0f1f76782cebeae9b90617aec5428e0bb9c3d5f Mon Sep 17 00:00:00 2001 From: Victor Gonzalez Date: Fri, 24 Apr 2020 12:56:52 -0400 Subject: [PATCH 1/2] prepare docker-compose format Signed-off-by: Victor Gonzalez --- docker-compose.yml | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b9990412a..c700185f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,32 +1,44 @@ -version: "3" +version: '3.2' services: - app: - build: docker/php + + frontend: + build: frontend + ports: + - 20080:80 volumes: + - ~/.composer-docker/cache:/root/.composer/cache:delegated - ./:/app depends_on: - db - mailcatcher - env_file: - - .env - webpacker: - image: node:9-alpine - working_dir: /app + backend: + build: backend + ports: + - 21080:80 volumes: + - ~/.composer-docker/cache:/root/.composer/cache:delegated - ./:/app - command: /bin/true + depends_on: + - db + - mailcatcher - nginx: - image: nginx:1.12-alpine + + storage: + build: storage ports: - - 80:80 + - 22080:80 volumes: + - ~/.composer-docker/cache:/root/.composer/cache:delegated - ./:/app - - ./docker/nginx/vhost.conf:/etc/nginx/conf.d/vhost.conf - depends_on: - - app + + webpacker: + image: node:9-alpine + working_dir: /app + volumes: + - ./:/app + command: /bin/true mailcatcher: image: schickling/mailcatcher:latest @@ -34,7 +46,7 @@ services: - 1080:1080 db: - image: mysql:5.7 + image: mysql:5.8 volumes: - /var/lib/mysql - ./docker/mysql/config.cnf:/etc/mysql/conf.d/config.cnf From bab00dfecdf1f65e95772560adeea6268f8131ff Mon Sep 17 00:00:00 2001 From: Victor Gonzalez Date: Fri, 24 Apr 2020 17:48:48 -0400 Subject: [PATCH 2/2] add small changes Signed-off-by: Victor Gonzalez --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c700185f8..cdce76d26 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,6 @@ services: - db - mailcatcher - storage: build: storage ports: