Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug: aws 인스턴스에 환경변수 전달 안되는 문제 수정 및 docker compose 파일 db에 의존성 가지게 수정 #5

Merged
merged 6 commits into from
Jul 20, 2024
Merged

bug: aws 인스턴스에 환경변수 전달 안되는 문제 수정 및 docker compose 파일 db에 의존성 가지게 수정 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d7c3a7
bug: aws 인스턴스에 환경변수 전달 안되는 문제 수정 및 docker compose 파일 db에 의존성 가지게 수정
injoon2019 Jul 19, 2024
e2c08b6
bug: 환경 변수 파일 배포할때 삭제하도록 변경
injoon2019 Jul 19, 2024
4fdcba8
bug: SERVER_USER_NAME도 secret 변수 사용하게 변경
injoon2019 Jul 20, 2024
899f559
bug: SERVER_USER_NAME 사용하던 곳 일괄 수정
injoon2019 Jul 20, 2024
4f6f542
chore: empty commit
injoon2019 Jul 20, 2024
d048d39
chore: empty commit
injoon2019 Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions .github/workflows/deploy-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,19 @@ 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 }}
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/${{ 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/$SERVER_USER_NAME/deploy
cd /home/${{ secrets.SERVER_USER_NAME }}/deploy
sudo chmod +x deploy.sh notify_error.sh
./deploy.sh
2 changes: 2 additions & 0 deletions deploy.sh
View file
Open in desktop
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 Down
4 changes: 1 addition & 3 deletions docker-compose.yml
View file
Open in desktop
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
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이거 아래 db에 의존성이 있는거 같아 수정했어요!


db:
container_name: mysql
Expand Down
Loading