Skip to content

Commit e26994f

Browse files
authored
Merge pull request #69 from boostcampwm-2024/fix/feed-crawler-ci-cd
[긴급] 🐛 fix: CI/CD 버그 수정 및 사용되지 않는 환경 변수 제거
2 parents 8ca4de1 + d0810b0 commit e26994f

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

.github/workflows/deploy_feed-crawler.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,51 +29,51 @@ jobs:
2929
script: |
3030
export NVM_DIR=~/.nvm
3131
source ~/.nvm/nvm.sh
32-
32+
3333
set -e
3434
echo "${{ secrets.CLOUD_PRIVATE_INSTANCE_SSH_KEY }}" > /tmp/private_key
3535
chmod 600 /tmp/private_key
36-
36+
3737
cd /var/web05-Denamu
3838
git pull origin main
3939
cd /var/web05-Denamu/feed-crawler/
4040
41-
echo "PORT=${{ secrets.FEED_CRAWLER_PORT }}" > .env
41+
echo "DB_PORT=${{ secrets.FEED_CRAWLER_DB_PORT }}" > .env
4242
echo "DB_HOST=${{ secrets.FEED_CRAWLER_DB_HOST }}" >> .env
4343
echo "DB_NAME=${{ secrets.FEED_CRAWLER_DB_NAME }}" >> .env
4444
echo "DB_USER=${{ secrets.FEED_CRAWLER_DB_USER }}" >> .env
4545
echo "DB_PASS=${{ secrets.FEED_CRAWLER_DB_PASSWORD }}" >> .env
46-
echo "DB_TABLE=${{ secrets.FEED_CRAWLER_DB_TABLE }}" >> .env
4746
echo "TIME_INTERVAL=${{ vars.FEED_CRAWLER_TIME_INTERVAL }}" >> .env
4847
echo "TEST_TIME_INTERVAL=${{ vars.FEED_CRAWLER_TEST_TIME_INTERVAL }}" >> .env
4948
echo "REDIS_HOST=${{secrets.REDIS_HOST }}" >> .env
5049
echo "REDIS_PORT=${{secrets.REDIS_PORT}}" >> .env
5150
echo "REDIS_USERNAME=${{secrets.REDIS_USERNAME}}" >> .env
5251
echo "REDIS_PASSWORD=${{secrets.REDIS_PASSWORD}}" >> .env
5352
echo "AI_API_KEY=${{secrets.AI_API_KEY}}" >> .env
54-
53+
echo "AI_RATE_LIMIT_COUNT=${{ secrets.AI_RATE_LIMIT_COUNT }}" >> .env
54+
5555
npm ci
5656
cd /var/web05-Denamu
5757
tar -czvf /tmp/app_feed_crawler.tar.gz feed-crawler
5858
scp -i /tmp/private_key /tmp/app_feed_crawler.tar.gz root@172.16.0.22:/tmp/app_feed_crawler.tar.gz
5959
6060
ssh -i /tmp/private_key ${{ secrets.CLOUD_PRIVATE_INSTANCE_USERNAME }}@${{ secrets.CLOUD_PRIVATE_INSTANCE_HOST }} << 'EOF'
61-
61+
6262
export NVM_DIR="$HOME/.nvm"
6363
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
6464
nvm use 22
65-
65+
6666
cd /var/web05-Denamu
6767
pm2 delete all
68-
68+
6969
cd /tmp
7070
tar -xzvf app_feed_crawler.tar.gz
7171
rm -rf /var/web05-Denamu/feed-crawler
7272
mv /tmp/feed-crawler /var/web05-Denamu
73-
73+
7474
cd /var/web05-Denamu/feed-crawler
7575
npm run build
7676
cd /var/web05-Denamu
77-
77+
7878
pm2 start ecosystem.config.js
79-
EOF
79+
EOF

.github/workflows/deploy_server.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ jobs:
2929
script: |
3030
export NVM_DIR=~/.nvm
3131
source ~/.nvm/nvm.sh
32-
32+
3333
set -e
3434
echo "${{ secrets.CLOUD_PRIVATE_INSTANCE_SSH_KEY }}" > /tmp/private_key
3535
chmod 600 /tmp/private_key
3636
3737
cd /var/web05-Denamu
3838
git pull origin main
3939
cd /var/web05-Denamu/server
40-
40+
4141
mkdir -p configs
4242
echo "PORT=${{ secrets.PRODUCT_PORT }}" > configs/.env.db.production
4343
echo "DB_TYPE=mysql" >> configs/.env.db.production
@@ -57,25 +57,25 @@ jobs:
5757
npm ci
5858
cd /var/web05-Denamu
5959
tar -czvf /tmp/app_server.tar.gz server
60-
scp -i /tmp/private_key /tmp/app_server.tar.gz root@172.16.0.22:/tmp/app_server.tar.gz
60+
scp -i /tmp/private_key /tmp/app_server.tar.gz root@${{ secrets.CLOUD_PRIVATE_INSTANCE_HOST }}:/tmp/app_server.tar.gz
6161
6262
ssh -i /tmp/private_key ${{ secrets.CLOUD_PRIVATE_INSTANCE_USERNAME }}@${{ secrets.CLOUD_PRIVATE_INSTANCE_HOST }} << 'EOF'
63-
63+
6464
export NVM_DIR="$HOME/.nvm"
6565
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
6666
nvm use 22
6767
node -v
6868
cd /var/web05-Denamu
6969
pm2 delete all
70-
70+
7171
cd /tmp
7272
tar -xzvf app_server.tar.gz
7373
rm -rf /var/web05-Denamu/server
7474
mv /tmp/server /var/web05-Denamu
75-
75+
7676
cd /var/web05-Denamu/server
7777
npm run build
7878
cd /var/web05-Denamu
7979
8080
pm2 start ecosystem.config.js
81-
EOF
81+
EOF

feed-crawler/src/common/mysql-access.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export class MySQLConnection implements DatabaseConnection {
2020
private createPool() {
2121
return mysql.createPool({
2222
host: process.env.DB_HOST,
23+
port: parseInt(process.env.DB_PORT),
2324
user: process.env.DB_USER,
2425
password: process.env.DB_PASS,
2526
database: process.env.DB_NAME,

0 commit comments

Comments
 (0)