From 68674fdd79ed9cb7735349355aeec9a996ae30b4 Mon Sep 17 00:00:00 2001
From: JadenKim-dev <jaden.kim@gmail.com>
Date: Mon, 20 Mar 2023 19:58:32 +0900
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EC=83=88=EB=A1=9C=EC=9A=B4=20d?=
 =?UTF-8?q?ocker=20=EC=8B=A4=ED=96=89=20=ED=99=98=EA=B2=BD=EC=97=90=20?=
 =?UTF-8?q?=EB=A7=9E=EC=B6=B0=EC=84=9C=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

docker-compose는 개발 용으로 변경
nginx 관련 코드 제거
---
 docker-compose.dev.yml | 36 ------------------------------------
 docker-compose.yml     | 20 ++++++++++----------
 nginx/Dockerfile       |  2 --
 nginx/default.conf     | 26 --------------------------
 4 files changed, 10 insertions(+), 74 deletions(-)
 delete mode 100644 docker-compose.dev.yml
 delete mode 100644 nginx/Dockerfile
 delete mode 100644 nginx/default.conf

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
deleted file mode 100644
index b42de07..0000000
--- a/docker-compose.dev.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: "3"
-services:
-  nimble-redis:
-    image: redis
-    ports:
-      - "6379:6379"
-    command: redis-server
-
-  nimble-client:
-    build:
-      dockerfile: Dockerfile.dev
-      context: ../client
-    volumes:
-      - /app/node_modules
-      - ../client:/usr/src/app
-    ports:
-      - "3000:3000"
-    stdin_open: true
-
-  nimble-nginx:
-    restart: always
-    build:
-      dockerfile: Dockerfile
-      context: ./nginx
-    ports:
-      - "80:80"
-
-  nimble-server:
-    build:
-      dockerfile: Dockerfile.dev
-      context: ../server
-    volumes:
-      - /app/node_modules
-      - ../server:/usr/src/app
-    ports:
-      - "3001:3001"
diff --git a/docker-compose.yml b/docker-compose.yml
index b4ee2ee..b5417c2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,5 @@
+# for development
+
 version: "3"
 services:
   nimble-redis:
@@ -8,23 +10,21 @@ services:
 
   nimble-client:
     build:
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.dev
       context: ../client
+    volumes:
+      - /app/node_modules
+      - ../client:/usr/src/app
     ports:
       - "3000:3000"
     stdin_open: true
 
-  nimble-nginx:
-    restart: always
-    build:
-      dockerfile: Dockerfile
-      context: ./nginx
-    ports:
-      - "80:80"
-
   nimble-server:
     build:
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.dev
       context: ../server
+    volumes:
+      - /app/node_modules
+      - ../server:/usr/src/app
     ports:
       - "3001:3001"
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
deleted file mode 100644
index 85ae399..0000000
--- a/nginx/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM nginx
-COPY ./default.conf /etc/nginx/conf.d/default.conf
\ No newline at end of file
diff --git a/nginx/default.conf b/nginx/default.conf
deleted file mode 100644
index c4831df..0000000
--- a/nginx/default.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-upstream nimble-client {
-  server nimble-client:3000;
-}
-
-upstream nimble-server {
-  server nimble-server:3001;
-}
-
-server {
-  listen 80;
-
-  location / {
-    proxy_pass http://nimble-client;
-  }
-
-  location /api {
-    proxy_pass http://nimble-server;
-  }
-
-  location /ws {
-    proxy_pass http://nimble-client;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-  }
-}
\ No newline at end of file

From bde2278dcbe4862c6f2118720c314bd314d29bbd Mon Sep 17 00:00:00 2001
From: JadenKim-dev <jaden.kim@gmail.com>
Date: Mon, 20 Mar 2023 20:11:22 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix(docker):=20volume=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=EC=9D=B4=20=EC=9E=98=EB=AA=BB=20=EB=90=98=EC=96=B4=EC=9E=88?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b5417c2..31d0738 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       dockerfile: Dockerfile.dev
       context: ../client
     volumes:
-      - /app/node_modules
+      - /usr/src/app/node_modules
       - ../client:/usr/src/app
     ports:
       - "3000:3000"
@@ -24,7 +24,7 @@ services:
       dockerfile: Dockerfile.dev
       context: ../server
     volumes:
-      - /app/node_modules
+      - /usr/src/app/node_modules
       - ../server:/usr/src/app
     ports:
       - "3001:3001"