Skip to content

Commit 632b9ec

Browse files
Merge pull request #368 from Finders-Official/develop
[RELEASE] v0.9.1 배포
2 parents 822c408 + 1869d3c commit 632b9ec

8 files changed

Lines changed: 22 additions & 18 deletions

File tree

.github/workflows/deploy-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
sudo mv ~/docker-compose.dev.yml /projects/Spring/docker-compose.dev.yml
9494
9595
cd /projects/Spring
96-
DC='sudo docker compose --env-file .env.dev -f docker-compose.infra.yml -f docker-compose.dev.yml'
96+
DC='sudo docker compose -p finders-dev --env-file .env.dev -f docker-compose.infra.yml -f docker-compose.dev.yml'
9797
9898
sudo docker network create finders-network || true
9999
echo '${{ secrets.ENV_DEV }}' | sudo tee .env.dev > /dev/null

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
sudo mv ~/docker-compose.prod.yml /projects/Spring/docker-compose.prod.yml
100100
101101
cd /projects/Spring
102-
DC='sudo docker compose --env-file .env.prod -f docker-compose.infra.yml -f docker-compose.prod.yml'
102+
DC='sudo docker compose -p finders-prod --env-file .env.prod -f docker-compose.infra.yml -f docker-compose.prod.yml'
103103
104104
sudo docker network create finders-network || true
105105
echo '${{ secrets.ENV_PROD }}' | sudo tee .env.prod > /dev/null

docker-compose.dev.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,20 @@
99
# ========================================
1010

1111
services:
12+
# ── Redis (dev 전용) ──
13+
redis-dev:
14+
image: redis:latest
15+
container_name: finders-redis-dev
16+
restart: unless-stopped
17+
command: redis-server --save 60 1 --loglevel warning
18+
healthcheck:
19+
test: ["CMD", "redis-cli", "ping"]
20+
interval: 10s
21+
timeout: 5s
22+
retries: 5
23+
networks:
24+
- finders-network
25+
1226
# ── Dev Blue ──
1327
dev-blue:
1428
image: findersofficial/finders-api:dev

docker-compose.infra.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,6 @@ services:
5050
networks:
5151
- finders-network
5252

53-
# ── Redis (dev) ──
54-
redis-dev:
55-
image: redis:latest
56-
container_name: finders-redis-dev
57-
restart: unless-stopped
58-
command: redis-server --save 60 1 --loglevel warning
59-
healthcheck:
60-
test: ["CMD", "redis-cli", "ping"]
61-
interval: 10s
62-
timeout: 5s
63-
retries: 5
64-
networks:
65-
- finders-network
66-
6753
networks:
6854
finders-network:
6955
external: true

docker-compose.prod.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ services:
2424
- .env.prod
2525
environment:
2626
SPRING_PROFILES_ACTIVE: prod
27+
SPRING_DATA_REDIS_SSL_ENABLED: "true"
2728
TZ: Asia/Seoul
2829
healthcheck:
2930
test: ["CMD", "wget", "--spider", "-q", "http://localhost:8080/api/actuator/health"]
@@ -54,6 +55,7 @@ services:
5455
- .env.prod
5556
environment:
5657
SPRING_PROFILES_ACTIVE: prod
58+
SPRING_DATA_REDIS_SSL_ENABLED: "true"
5759
TZ: Asia/Seoul
5860
healthcheck:
5961
test: ["CMD", "wget", "--spider", "-q", "http://localhost:8080/api/actuator/health"]

src/main/resources/application-dev.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ logging:
3838
com.finders: DEBUG
3939
org.springframework.web: INFO
4040
org.hibernate.SQL: DEBUG
41+
org.springframework.data.redis: DEBUG
42+
io.lettuce.core: DEBUG
4143

4244
# ========================================
4345
# Actuator (개발용 노출)

src/main/resources/application-local.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ logging:
2525
level:
2626
org.hibernate.SQL: DEBUG
2727
org.hibernate.orm.jdbc.bind: TRACE
28+
org.springframework.data.redis: DEBUG
29+
io.lettuce.core: DEBUG
2830

2931
auth:
3032
mock:

src/main/resources/application.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ logging:
185185
level:
186186
root: INFO
187187
com.finders: DEBUG
188-
org.springframework.data.redis: DEBUG
189-
io.lettuce.core: DEBUG
190188

191189
# ========================================
192190
# CORS 설정

0 commit comments

Comments
 (0)