From 5a5e437bd36f60b7ae8f43a69c2eec9a6547dcc5 Mon Sep 17 00:00:00 2001
From: Zaurbek Tsorojev <tsorojev.zaurbek@gmail.com>
Date: Thu, 9 Jun 2022 20:27:15 -0700
Subject: [PATCH] chore: run everything in docker-compose

---
 docker-compose.yml | 60 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a4de5f2a..ad99d2f7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,47 @@
-db:
-  image: mysql:latest
-  ports:
-    - "3306:3306"
-  environment:
-    MYSQL_ROOT_PASSWORD: password
-    MYSQL_USER: rdoc
-    MYSQL_PASSWORD: password
-    MYSQL_DATABASE: rdocs
-redis:
-  image: redis
-  ports:
-    - "6379:6379"
+version: '3.7'
+services:
+  rdocs-app:
+    container_name: rdocs-app
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    restart: always
+    ports:
+      - '3000:3000'
+    env_file:
+      - .env
+    environment:
+      - DATABASE_HOST=mysql-db
+      - DATABASE_USERNAME=root
+      - DATABASE_PASSWORD=password
+      - DATABASE_NAME=rdocs
+      - DATABASE_PORT=3306
+      - REDIS_URL=redis://redis:6379
+    depends_on:
+      - db
+      - redis
+    networks:
+      - gateway
+  db:
+    container_name: mysql-db
+    image: mysql:latest
+    command: --default-authentication-plugin=mysql_native_password
+    restart: always
+    ports:
+      - "3308:3306"
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+      - MYSQL_USER=rdoc
+      - MYSQL_PASSWORD=password
+      - MYSQL_DATABASE=rdocs
+    networks:
+      - gateway
+  redis:
+    container_name: redis
+    image: redis
+    ports:
+      - "6379:6379"
+    networks:
+      - gateway
+networks:
+  gateway: {}
\ No newline at end of file