diff --git a/.github/workflows/production-deploy.yml b/.github/workflows/production-deploy.yml index 9cb358c..ebba5f2 100644 --- a/.github/workflows/production-deploy.yml +++ b/.github/workflows/production-deploy.yml @@ -60,12 +60,13 @@ jobs: DB_URL: ${{ secrets.DB_URL }} DB_USERNAME: ${{ secrets.DB_USERNAME }} DB_PASSWORD: ${{ secrets.DB_PASSWORD }} + GRAFANA_PASSWORD: ${{ secrets.GRAFANA_PASSWORD }} with: host: ${{ secrets.SSH_HOST_02 }} username: ${{ secrets.SSH_USER }} key: ${{ secrets.SSH_PRIVATE_KEY }} script_stop: true - envs: NLB_ID,ACCESS_TOKEN_SECRET_KEY,REFRESH_TOKEN_SECRET_KEY,DB_URL,DB_USERNAME,DB_PASSWORD + envs: NLB_ID,ACCESS_TOKEN_SECRET_KEY,REFRESH_TOKEN_SECRET_KEY,DB_URL,DB_USERNAME,DB_PASSWORD,GRAFANA_PASSWORD script: | cd ~/snackgame-server/repo git fetch origin main @@ -89,12 +90,13 @@ jobs: DB_URL: ${{ secrets.DB_URL }} DB_USERNAME: ${{ secrets.DB_USERNAME }} DB_PASSWORD: ${{ secrets.DB_PASSWORD }} + GRAFANA_PASSWORD: ${{ secrets.GRAFANA_PASSWORD }} with: host: ${{ secrets.SSH_HOST_01 }} username: ${{ secrets.SSH_USER }} key: ${{ secrets.SSH_PRIVATE_KEY }} script_stop: true - envs: NLB_ID,ACCESS_TOKEN_SECRET_KEY,REFRESH_TOKEN_SECRET_KEY,DB_URL,DB_USERNAME,DB_PASSWORD + envs: NLB_ID,ACCESS_TOKEN_SECRET_KEY,REFRESH_TOKEN_SECRET_KEY,DB_URL,DB_USERNAME,DB_PASSWORD,GRAFANA_PASSWORD script: | cd ~/snackgame-server/repo git fetch origin main diff --git a/scripts/deploy-rolling.sh b/scripts/deploy-rolling.sh index 15122c6..47e9456 100755 --- a/scripts/deploy-rolling.sh +++ b/scripts/deploy-rolling.sh @@ -80,7 +80,7 @@ wait_healthy() { rollback() { echo "[롤백] 이전 컨테이너로 복구 중..." cd "$COMPOSE_DIR" - docker compose up -d + docker compose up -d snackgame-server set_drain false echo "[롤백] 완료" exit 1 @@ -106,7 +106,7 @@ docker compose pull echo "[배포] 컨테이너 교체 중..." -docker compose up -d || rollback +docker compose up -d snackgame-server || rollback wait_healthy || rollback