Skip to content

Commit 64c7cd7

Browse files
committed
๐Ÿ› fix: ์ดˆ๊ธฐํ™” ์„ค์ •ํŒŒ์ผ ์•ˆ์ •์„ฑ ํ–ฅ์ƒ ๋ฐ ๋น„๋ฐ€๋ฒˆํ˜ธ ๋…ธ์ถœ ๋ฐฉ์ง€ ๊ตฌ๋ฌธ ์ถ”๊ฐ€
1 parent d81db0e commit 64c7cd7

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

โ€Ž.github/workflows/deploy_infra.ymlโ€Ž

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: ์ฝ”๋“œ ์ฒดํฌ์•„์›ƒ
1919
uses: actions/checkout@v4
2020

21-
- name: ์ธํ”„๋ผ ํ™˜๊ฒฝ๋ณ€์ˆ˜ ์ตœ์‹ ํ™”
21+
- name: ์ธํ”„๋ผ ํ™˜๊ฒฝ๋ณ€์ˆ˜ ๋ฐ ์„ค์ • ํŒŒ์ผ ์ตœ์‹ ํ™”
2222
run: |
2323
sudo mkdir -p /var/prod_config/infra
2424
sudo install -m 600 /dev/null /var/prod_config/infra/.env.prod
@@ -30,12 +30,14 @@ jobs:
3030
echo "MYSQL_USER=${{ secrets.PRODUCT_DB_USERNAME }}"
3131
echo "MYSQL_PASSWORD=${{ secrets.PRODUCT_DB_PASSWORD }}"
3232
echo "RABBITMQ_USERNAME=${{ secrets.PRODUCT_RABBITMQ_USERNAME }}"
33-
echo "RABBITMQ_PASSWORD=${{ secrets.PRODUCT_RABBITMQ_PASSWORD }}"
34-
echo "RABBITMQ_HOST=${{ secrets.PRODUCT_RABBITMQ_HOST }}"
35-
echo "RABBITMQ_PORT=${{ secrets.PRODUCT_RABBITMQ_PORT }}"
36-
echo "RABBITMQ_MANAGEMENT_PORT=${{ secrets.PRODUCT_RABBITMQ_MANAGEMENT_PORT }}"
33+
echo "RABBITMQ_PASSWORD=${{ secrets.PRODUCT_RABBITMQ_PASSWORD }}"
34+
echo "RABBITMQ_HOST=${{ secrets.PRODUCT_RABBITMQ_HOST }}"
35+
echo "RABBITMQ_PORT=${{ secrets.PRODUCT_RABBITMQ_PORT }}"
36+
echo "RABBITMQ_MANAGEMENT_PORT=${{ secrets.PRODUCT_RABBITMQ_MANAGEMENT_PORT }}"
3737
} | sudo tee /var/prod_config/infra/.env.prod >/dev/null
3838
39+
sudo chmod +x docker-compose/redis-init.sh
40+
3941
- name: ์ธํ”„๋ผ ์„œ๋น„์Šค ์žฌ์‹œ์ž‘
4042
run: |
4143
docker compose -f "$COMPOSE_FILE" down
Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/sh
2+
set -e
23

34
# Redis ์„œ๋ฒ„๋ฅผ ๋ฐฑ๊ทธ๋ผ์šด๋“œ์—์„œ ์‹œ์ž‘
45
redis-server --daemonize yes
@@ -9,12 +10,27 @@ sleep 5
910
# ํ™˜๊ฒฝ๋ณ€์ˆ˜๋ฅผ ์‚ฌ์šฉํ•˜์—ฌ ACL ์‚ฌ์šฉ์ž ์ƒ์„ฑ
1011
# ์ปจํ…Œ์ด๋„ˆ ๋‚ด๋ถ€์—์„œ ์‹คํ–‰๋˜๋ฏ€๋กœ env_file๋กœ ์ฃผ์ž…๋œ ํ™˜๊ฒฝ๋ณ€์ˆ˜ ์‚ฌ์šฉ ๊ฐ€๋Šฅ
1112
if [ -n "$REDIS_USER" ] && [ -n "$REDIS_PASSWORD" ]; then
12-
echo "ACL SETUSER $REDIS_USER on >$REDIS_PASSWORD allkeys allcommands" | redis-cli
13-
echo "Redis ACL user created: $REDIS_USER"
13+
# heredoc์„ ์‚ฌ์šฉํ•˜์—ฌ ๋น„๋ฐ€๋ฒˆํ˜ธ ๋…ธ์ถœ ๋ฐฉ์ง€
14+
if redis-cli <<EOF
15+
ACL SETUSER $REDIS_USER on >$REDIS_PASSWORD allkeys allcommands
16+
ACL SAVE
17+
EOF
18+
then
19+
echo "Redis ACL user created and saved: $REDIS_USER"
20+
else
21+
echo "Error: Failed to create Redis ACL user"
22+
exit 1
23+
fi
1424
else
1525
echo "Warning: REDIS_USER or REDIS_PASSWORD not set"
26+
echo "Error: Redis credentials are required"
27+
exit 1
1628
fi
1729

18-
# ํฌ๊ทธ๋ผ์šด๋“œ๋กœ Redis ์žฌ์‹œ์ž‘ (์ปจํ…Œ์ด๋„ˆ๊ฐ€ ์ข…๋ฃŒ๋˜์ง€ ์•Š๋„๋ก)
30+
# ACL ์„ค์ •์ด ์™„๋ฃŒ๋˜์—ˆ์œผ๋ฏ€๋กœ Redis๋ฅผ ์•ˆ์ „ํ•˜๊ฒŒ ์ข…๋ฃŒ
1931
redis-cli shutdown
32+
# Redis๊ฐ€ ์™„์ „ํžˆ ์ข…๋ฃŒ๋  ๋•Œ๊นŒ์ง€ ๋Œ€๊ธฐ
33+
sleep 2
34+
35+
# ํฌ๊ทธ๋ผ์šด๋“œ๋กœ Redis ์žฌ์‹œ์ž‘ (์ปจํ…Œ์ด๋„ˆ๊ฐ€ ์ข…๋ฃŒ๋˜์ง€ ์•Š๋„๋ก)
2036
exec redis-server

0 commit comments

Comments
ย (0)