Merge branch 'main' of https://github.com/SoulNaturalist/BookList

SoulNaturalist · Mar 10, 2024 · 03e9d23 · 03e9d23
2 parents c773e2c + dfade3a
commit 03e9d23
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,6 +9,8 @@ services:
     environment:
       - MONGO_URI=${DATABASE_URL}
     command: node app.js
+    networks:
+      - mynetwork
 
   frontend:
     build:
@@ -18,6 +20,8 @@ services:
     container_name: front
     ports:
       - "3000:3000"
+    networks:
+      - mynetwork
 
   mongo:
     image: mongo:latest
@@ -28,6 +32,8 @@ services:
       - ./data/db:/data/db
     environment:
       - MONGO_URI=${DATABASE_URL}
+    networks:
+      - mynetwork
 
   nginx:
     image: nginx:latest
@@ -37,4 +43,10 @@ services:
       - "443:443"
     volumes:
       - ./nginx/backend.conf:/etc/nginx/conf.d/backend.conf
-      - ./nginx/front.conf:/etc/nginx/conf.d/front.conf
+      - ./nginx/front.conf:/etc/nginx/conf.d/front.conf
+      - ./front/build:/var/www/courseio.ru
+    networks:
+      - mynetwork
+
+networks:
+  mynetwork:
diff --git a/nginx/backend.conf b/nginx/backend.conf
@@ -1,8 +1,12 @@
+upstream backend {
+    server backend:3030;
+}
+
 server {
     listen 80;
-    server_name api.book-list.ru;
+    server_name api.courseio.ru;
 
     location / {
-        proxy_pass http://localhost:3000;
+        proxy_pass http://backend;
     }
-}
+}