From c6bb379d62d2348007d79e8f0cfd7096d9e100fd Mon Sep 17 00:00:00 2001
From: Jeonghyun Lee <hyeon00@ewhain.net>
Date: Fri, 29 Sep 2023 07:15:12 +0900
Subject: [PATCH] =?UTF-8?q?[chore]=20docker=20image=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy_dev.yml  |  4 ++--
 .github/workflows/deploy_prod.yml |  2 +-
 config/nginx/default.conf         |  2 +-
 docker-compose.dev.yml            | 26 ++++++++++++++++++++++++++
 docker-compose.yml                | 10 +++++-----
 5 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 docker-compose.dev.yml

diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml
index ed7f44b1..88b9db8b 100644
--- a/.github/workflows/deploy_dev.yml
+++ b/.github/workflows/deploy_dev.yml
@@ -97,6 +97,6 @@ jobs:
             sudo docker stop $(sudo docker ps -a -q)
             sudo docker rm $(sudo docker ps -a -q)
             sudo docker rmi $(sudo docker images -q)
-            sudo docker-compose -f ~/srv/ubuntu/docker-compose.yml pull
-            sudo docker-compose -f ~/srv/ubuntu/docker-compose.yml up --build -d
+            sudo docker-compose -f ~/srv/ubuntu/docker-compose.dev.yml pull
+            sudo docker-compose -f ~/srv/ubuntu/docker-compose.dev.yml up --build -d
 
diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml
index c03fc2c0..98ab2ea9 100644
--- a/.github/workflows/deploy_prod.yml
+++ b/.github/workflows/deploy_prod.yml
@@ -67,7 +67,7 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ secrets.DOCKER_USERNAME }}/ceos-backend-dev
+          tags: ${{ secrets.DOCKER_USERNAME }}/ceos-backend
 
       - name: create remote directory
         uses: appleboy/ssh-action@master
diff --git a/config/nginx/default.conf b/config/nginx/default.conf
index d648d69f..22b378a3 100644
--- a/config/nginx/default.conf
+++ b/config/nginx/default.conf
@@ -4,7 +4,7 @@ server {
 
     location / {
       proxy_set_header        Host $host;
-      proxy_pass              http://backend-dev:8080/;
+      proxy_pass              http://backend:8080/;
       proxy_read_timeout      90;
 
       ## try_files $uri $uri/ =404;
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 00000000..7e2e7001
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,26 @@
+version: "3"
+
+services:
+  backend:
+    image: ceos17/ceos-backend-dev
+    container_name: backend
+    hostname: backend
+    expose:
+      - "8080"
+
+  nginx:
+    depends_on:
+      - backend
+    restart: always
+    build:
+      dockerfile: Dockerfile
+      context: ./config/nginx
+    ports:
+      - "80:80"
+
+  redis:
+    image: redis:latest
+    container_name: redis
+    hostname: redis
+    ports:
+      - "6379:6379"
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index bf06fc2a..f5bf4fc8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,16 @@
 version: "3"
 
 services:
-  backend-dev:
-    image: ceos17/ceos-backend-dev
-    container_name: backend-dev
-    hostname: backend-dev
+  backend:
+    image: ceos17/ceos-backend
+    container_name: backend
+    hostname: backend
     expose:
       - "8080"
 
   nginx:
     depends_on:
-      - backend-dev
+      - backend
     restart: always
     build:
       dockerfile: Dockerfile