Skip to content

Commit

Permalink
bug: aws 인스턴스에 환경변수 전달 안되는 문제 수정 및 docker compose 파일 db에 의존성 가지게 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
injoon2019 committed Jul 19, 2024
1 parent 36b75a3 commit 5d7c3a7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/deploy-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
4 changes: 1 addition & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.8'

services:
nginx:
container_name: nginx
Expand All @@ -19,7 +17,7 @@ services:
ports:
- "8080:8080"
depends_on:
- mysql
- db

db:
container_name: mysql
Expand Down

0 comments on commit 5d7c3a7

Please sign in to comment.