From 4b52953c361b61b45b094026491d468ab999144e Mon Sep 17 00:00:00 2001
From: Jisu Lim <69844138+Ji-soo708@users.noreply.github.com>
Date: Fri, 31 Jan 2025 01:37:44 +0900
Subject: [PATCH] =?UTF-8?q?[YS-236]=20chore:=20=EA=B0=9C=EB=B0=9C/?=
 =?UTF-8?q?=EC=9A=B4=EC=98=81=20=ED=99=98=EA=B2=BD=EC=97=90=20=EB=94=B0?=
 =?UTF-8?q?=EB=9D=BC=20=EB=8F=84=EC=BB=A4=20=EC=9D=B4=EB=AF=B8=EC=A7=80?=
 =?UTF-8?q?=EC=97=90=20=ED=83=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#72)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: add env tag to docker image

* chore: alter cicd yml for added file
---
 .github/workflows/cicd-dev.yml               |  4 ++--
 .github/workflows/cicd-prod.yml              |  4 ++--
 docker-compose.yml => docker-compose-dev.yml |  4 ++--
 docker-compose-prod.yml                      | 20 ++++++++++++++++++++
 4 files changed, 26 insertions(+), 6 deletions(-)
 rename docker-compose.yml => docker-compose-dev.yml (82%)
 create mode 100644 docker-compose-prod.yml

diff --git a/.github/workflows/cicd-dev.yml b/.github/workflows/cicd-dev.yml
index 8710986d..cd238d0f 100644
--- a/.github/workflows/cicd-dev.yml
+++ b/.github/workflows/cicd-dev.yml
@@ -47,14 +47,14 @@ jobs:
           source: "./scripts/deploy.sh"
           target: "/home/ubuntu/"
 
-      - name: ✔️ send docker-compose.yml to EC2 development server
+      - name: ✔️ send docker-compose-dev.yml to EC2 development server
         uses: appleboy/scp-action@master
         with:
           username: ubuntu
           host: ${{ secrets.DEV_WAS_HOST }}
           key: ${{ secrets.DEV_WAS_KEY }}
           port: ${{ secrets.WAS_SSH_PORT }}
-          source: "./docker-compose.yml"
+          source: "./docker-compose-dev.yml"
           target: "/home/ubuntu/"
 
   cd:
diff --git a/.github/workflows/cicd-prod.yml b/.github/workflows/cicd-prod.yml
index 39241bdc..6d07bd2e 100644
--- a/.github/workflows/cicd-prod.yml
+++ b/.github/workflows/cicd-prod.yml
@@ -47,14 +47,14 @@ jobs:
           source: "./scripts/deploy.sh"
           target: "/home/ubuntu/"
 
-      - name: ✔️ send docker-compose.yml to EC2 production server
+      - name: ✔️ send docker-compose-prod.yml to EC2 production server
         uses: appleboy/scp-action@master
         with:
           username: ubuntu
           host: ${{ secrets.PROD_WAS_HOST }}
           key: ${{ secrets.PROD_WAS_KEY }}
           port: ${{ secrets.WAS_SSH_PORT }}
-          source: "./docker-compose.yml"
+          source: "./docker-compose-prod.yml"
           target: "/home/ubuntu/"
 
   cd:
diff --git a/docker-compose.yml b/docker-compose-dev.yml
similarity index 82%
rename from docker-compose.yml
rename to docker-compose-dev.yml
index cdee30e2..772ee193 100644
--- a/docker-compose.yml
+++ b/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
   blue:
     container_name: blue
-    image: jisoo708/dobby
+    image: gradmeet/dobby:dev
     expose:
       - 8080
     ports:
@@ -11,7 +11,7 @@ services:
       - TZ=Asia/Seoul
   green:
     container_name: green
-    image: jisoo708/dobby
+    image: gradmeet/dobby:dev
     expose:
       - 8080
     ports:
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
new file mode 100644
index 00000000..42d18562
--- /dev/null
+++ b/docker-compose-prod.yml
@@ -0,0 +1,20 @@
+version: '3.8'
+services:
+  blue:
+    container_name: blue
+    image: gradmeet/dobby:prod
+    expose:
+      - 8080
+    ports:
+      - "8081:8080"
+    environment:
+      - TZ=Asia/Seoul
+  green:
+    container_name: green
+    image: gradmeet/dobby:prod
+    expose:
+      - 8080
+    ports:
+      - "8082:8080"
+    environment:
+      - TZ=Asia/Seoul