From 5d7c3a7e24e950bddf46c06b9dc0ce18f8e067f1 Mon Sep 17 00:00:00 2001 From: injoon2019 Date: Sat, 20 Jul 2024 02:00:58 +0900 Subject: [PATCH 1/6] =?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 From e2c08b603d7503e9ea5086fc3f3713d4df3a32fe Mon Sep 17 00:00:00 2001 From: injoon2019 Date: Sat, 20 Jul 2024 02:09:52 +0900 Subject: [PATCH 2/6] =?UTF-8?q?bug:=20=ED=99=98=EA=B2=BD=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=ED=8C=8C=EC=9D=BC=20=EB=B0=B0=ED=8F=AC=ED=95=A0?= =?UTF-8?q?=EB=95=8C=20=EC=82=AD=EC=A0=9C=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-workflow.yml | 4 ++++ deploy.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-workflow.yml b/.github/workflows/deploy-workflow.yml index 2d8c0e5d..481c88df 100644 --- a/.github/workflows/deploy-workflow.yml +++ b/.github/workflows/deploy-workflow.yml @@ -57,6 +57,10 @@ jobs: username: ${{ secrets.SERVER_USER_NAME }} key: ${{ secrets.SERVER_PRIVATE_KEY }} script: | + if [ -f /home/$SERVER_USER_NAME/deploy/env_vars.sh ]; then + rm /home/$SERVER_USER_NAME/deploy/env_vars.sh + fi + 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 diff --git a/deploy.sh b/deploy.sh index 86fe5ab4..bdfba1b6 100644 --- a/deploy.sh +++ b/deploy.sh @@ -23,5 +23,3 @@ 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 From 4fdcba8acc8842dc2426fbd7c01aa052e826b05b Mon Sep 17 00:00:00 2001 From: injoon2019 Date: Sat, 20 Jul 2024 14:44:59 +0900 Subject: [PATCH 3/6] =?UTF-8?q?bug:=20SERVER=5FUSER=5FNAME=EB=8F=84=20secr?= =?UTF-8?q?et=20=EB=B3=80=EC=88=98=20=EC=82=AC=EC=9A=A9=ED=95=98=EA=B2=8C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-workflow.yml b/.github/workflows/deploy-workflow.yml index 481c88df..632cbdc1 100644 --- a/.github/workflows/deploy-workflow.yml +++ b/.github/workflows/deploy-workflow.yml @@ -57,8 +57,8 @@ jobs: username: ${{ secrets.SERVER_USER_NAME }} key: ${{ secrets.SERVER_PRIVATE_KEY }} script: | - if [ -f /home/$SERVER_USER_NAME/deploy/env_vars.sh ]; then - rm /home/$SERVER_USER_NAME/deploy/env_vars.sh + if [ -f /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh ]; then + rm /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh fi echo "SERVER_NGINX_CONF=${{ secrets.SERVER_NGINX_CONF }}" > /home/$SERVER_USER_NAME/deploy/env_vars.sh @@ -70,6 +70,6 @@ jobs: 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 + cd /home/${{ secrets.SERVER_USER_NAME }}/deploy sudo chmod +x deploy.sh notify_error.sh ./deploy.sh From 899f55999410854f54c361a48d4fce5cf48bb1c9 Mon Sep 17 00:00:00 2001 From: injoon2019 Date: Sat, 20 Jul 2024 14:49:12 +0900 Subject: [PATCH 4/6] =?UTF-8?q?bug:=20SERVER=5FUSER=5FNAME=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8D=98=20=EA=B3=B3=20=EC=9D=BC=EA=B4=84=20?= =?UTF-8?q?=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 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-workflow.yml b/.github/workflows/deploy-workflow.yml index 632cbdc1..70db2bef 100644 --- a/.github/workflows/deploy-workflow.yml +++ b/.github/workflows/deploy-workflow.yml @@ -61,14 +61,14 @@ jobs: rm /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh fi - 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 + echo "SERVER_NGINX_CONF=${{ secrets.SERVER_NGINX_CONF }}" > /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh + echo "SERVER_USER_NAME=${{ secrets.SERVER_USER_NAME }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh + echo "DOCKER_USERNAME=${{ secrets.DOCKER_USERNAME }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh + echo "DOCKER_TAG=${{ env.DATETIME_TAG }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh + echo "DB_DATABASE=${{ secrets.DB_DATABASE }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh + echo "DB_USER_NAME=${{ secrets.DB_USER_NAME }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh + echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh + echo "DISCORD_WEBHOOK_URL=${{ secrets.DISCORD_WEBHOOK_URL }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh cd /home/${{ secrets.SERVER_USER_NAME }}/deploy sudo chmod +x deploy.sh notify_error.sh From 4f6f5427c815b2d2b81bc1c5ad8d73fec7601cef Mon Sep 17 00:00:00 2001 From: injoon2019 Date: Sat, 20 Jul 2024 15:35:07 +0900 Subject: [PATCH 5/6] chore: empty commit --- deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy.sh b/deploy.sh index bdfba1b6..84a316c1 100644 --- a/deploy.sh +++ b/deploy.sh @@ -23,3 +23,4 @@ if [ "$LATEST_TAG" != "$RUNNING_TAG" ]; then fi sudo docker image prune -f + From d048d390368909ebfc27deb90faf182ab40b665f Mon Sep 17 00:00:00 2001 From: injoon2019 Date: Sat, 20 Jul 2024 15:39:47 +0900 Subject: [PATCH 6/6] chore: empty commit --- deploy.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 84a316c1..bdfba1b6 100644 --- a/deploy.sh +++ b/deploy.sh @@ -23,4 +23,3 @@ if [ "$LATEST_TAG" != "$RUNNING_TAG" ]; then fi sudo docker image prune -f -