From 5d7c3a7e24e950bddf46c06b9dc0ce18f8e067f1 Mon Sep 17 00:00:00 2001
From: injoon2019 <ison@sfu.ca>
Date: Sat, 20 Jul 2024 02:00:58 +0900
Subject: [PATCH] =?UTF-8?q?bug:=20aws=20=EC=9D=B8=EC=8A=A4=ED=84=B4?=
 =?UTF-8?q?=EC=8A=A4=EC=97=90=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20?=
 =?UTF-8?q?=EC=A0=84=EB=8B=AC=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20docker=20compose?=
 =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20db=EC=97=90=20=EC=9D=98=EC=A1=B4?=
 =?UTF-8?q?=EC=84=B1=20=EA=B0=80=EC=A7=80=EA=B2=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy-workflow.yml | 16 ++++++++--------
 deploy.sh                             |  4 ++++
 docker-compose.yml                    |  4 +---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy-workflow.yml b/.github/workflows/deploy-workflow.yml
index d1add0e9..2d8c0e5d 100644
--- a/.github/workflows/deploy-workflow.yml
+++ b/.github/workflows/deploy-workflow.yml
@@ -57,14 +57,14 @@ jobs:
           username: ${{ secrets.SERVER_USER_NAME }}
           key: ${{ secrets.SERVER_PRIVATE_KEY }}
           script: |
-            export SERVER_NGINX_CONF=${{ secrets.SERVER_NGINX_CONF }}
-            export SERVER_USER_NAME=${{ secrets.SERVER_USER_NAME }}
-            export DOCKER_USERNAME=${{ secrets.DOCKER_USERNAME }}
-            export DOCKER_TAG=${{ env.DATETIME_TAG }}
-            export DB_DATABASE=${{ secrets.DB_DATABASE }}
-            export DB_USER_NAME=${{ secrets.DB_USER_NAME }}
-            export DB_PASSWORD=${{ secrets.DB_PASSWORD }}
-            export DISCORD_WEBHOOK_URL=${{ secrets.DISCORD_WEBHOOK_URL }}
+            echo "SERVER_NGINX_CONF=${{ secrets.SERVER_NGINX_CONF }}" > /home/$SERVER_USER_NAME/deploy/env_vars.sh
+            echo "SERVER_USER_NAME=${{ secrets.SERVER_USER_NAME }}" >> /home/$SERVER_USER_NAME/deploy/env_vars.sh
+            echo "DOCKER_USERNAME=${{ secrets.DOCKER_USERNAME }}" >> /home/$SERVER_USER_NAME/deploy/env_vars.sh
+            echo "DOCKER_TAG=${{ env.DATETIME_TAG }}" >> /home/$SERVER_USER_NAME/deploy/env_vars.sh
+            echo "DB_DATABASE=${{ secrets.DB_DATABASE }}" >> /home/$SERVER_USER_NAME/deploy/env_vars.sh
+            echo "DB_USER_NAME=${{ secrets.DB_USER_NAME }}" >> /home/$SERVER_USER_NAME/deploy/env_vars.sh
+            echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> /home/$SERVER_USER_NAME/deploy/env_vars.sh
+            echo "DISCORD_WEBHOOK_URL=${{ secrets.DISCORD_WEBHOOK_URL }}" >> /home/$SERVER_USER_NAME/deploy/env_vars.sh
 
             cd /home/$SERVER_USER_NAME/deploy
             sudo chmod +x deploy.sh notify_error.sh
diff --git a/deploy.sh b/deploy.sh
index 1cde52ca..86fe5ab4 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source /home/$SERVER_USER_NAME/deploy/env_vars.sh
+
 sudo docker pull ${DOCKER_USERNAME}/bottles:${DOCKER_TAG}
 cd ../docker
 docker-compose up -d
@@ -21,3 +23,5 @@ if [ "$LATEST_TAG" != "$RUNNING_TAG" ]; then
 fi
 
 sudo docker image prune -f
+
+rm /home/$SERVER_USER_NAME/deploy/env_vars.sh
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 99bfdd57..dfe38f63 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   nginx:
     container_name: nginx
@@ -19,7 +17,7 @@ services:
     ports:
       - "8080:8080"
     depends_on:
-      - mysql
+      - db
 
   db:
     container_name: mysql