Skip to content

Commit 315be85

Browse files
daylikezerodaylikezero
authored
Merge pull request #284 from spring-team-7/build
[fix] ์„œ๋ฒ„ ์‹คํ–‰ ์˜ค๋ฅ˜ ํ•ด๊ฒฐ
2 parents 129342b + 77ce228 commit 315be85

6 files changed

Lines changed: 244 additions & 119 deletions

File tree

โ€Ždocker-compose.ymlโ€Ž

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
version: '3.8'
22
services:
3+
redis:
4+
image: redis:latest
5+
container_name: redis
6+
ports:
7+
- "6379:6379"
8+
healthcheck:
9+
test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
10+
interval: 5s
11+
retries: 10
12+
13+
rabbitmq:
14+
build:
15+
context: ./
16+
dockerfile: Dockerfile.rabbitmq
17+
image: rabbitmq:3-management
18+
container_name: rabbitmq
19+
ports:
20+
- "5672:5672"
21+
- "15672:15672"
22+
- "61613:61613"
23+
environment:
24+
RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
25+
RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
26+
327
es:
428
build:
529
context: ./
@@ -52,5 +76,7 @@ services:
5276
- es
5377

5478
volumes:
79+
mysql-data:
80+
driver: local
5581
es-data:
5682
driver: local

โ€Žlogstash/pipelines/logstash.confโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ filter {
2828

2929
output {
3030
elasticsearch {
31-
hosts => ["http://host.docker.internal:9200"]
31+
hosts => ["${ES_HOST}"]
3232
index => "${INDEX_NAME}"
3333
manage_template => false
3434
document_id => "%{id}"

โ€Žsrc/main/resources/application-local.ymlโ€Ž

Lines changed: 52 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,17 @@ spring:
22
config:
33
import: optional:file:.env.local[.properties]
44

5-
batch:
6-
job:
7-
enabled: false
8-
jdbc:
9-
initialize-schema: always
10-
schema: classpath:org/springframework/batch/core/schema-mysql.sql
11-
125
datasource-meta:
136
driver-class-name: com.mysql.cj.jdbc.Driver
14-
jdbc-url: ${DB_URL_META}
15-
username: ${DB_USER_META}
16-
password: ${DB_PASSWORD_META}
7+
jdbc-url: jdbc:mysql://${AWS_RDS_HOST}:${AWS_RDS_PORT}/${AWS_RDS_META_DB_NAME}
8+
username: ${AWS_RDS_USERNAME}
9+
password: ${AWS_RDS_PASSWORD}
1710

1811
datasource-data:
1912
driver-class-name: com.mysql.cj.jdbc.Driver
20-
jdbc-url: ${DB_URL_DATA}
21-
username: ${DB_USER_DATA}
22-
password: ${DB_PASSWORD_DATA}
23-
24-
cloud:
25-
aws:
26-
region:
27-
static: ap-northeast-2
13+
jdbc-url: jdbc:mysql://${AWS_RDS_HOST}:${AWS_RDS_PORT}/${AWS_RDS_DB_NAME}
14+
username: ${AWS_RDS_USERNAME}
15+
password: ${AWS_RDS_PASSWORD}
2816

2917
jpa:
3018
hibernate:
@@ -60,10 +48,55 @@ spring:
6048
ssl:
6149
enabled: ${RABBITMQ_SSL}
6250

51+
data:
52+
redis:
53+
host: ${REDIS_HOST}
54+
port: ${REDIS_PORT}
55+
ssl:
56+
enabled: true
57+
58+
elasticsearch:
59+
uris: ${ELASTICSEARCH_URIS}
60+
61+
cache:
62+
type: redis
63+
64+
rabbitmq:
65+
host: ${RABBITMQ_HOST}
66+
port: ${RABBITMQ_PORT}
67+
username: ${RABBITMQ_USER}
68+
password: ${RABBITMQ_PASSWORD}
69+
ssl:
70+
enabled: true
71+
72+
jwt:
73+
secret:
74+
key: ${JWT_SECRET_KEY}
75+
76+
toss:
77+
secret:
78+
key: ${TOSS_SECRET_KEY}
79+
80+
cloud:
81+
aws:
82+
credentials:
83+
accessKey: ${AWS_ACCESS_KEY}
84+
secretKey: ${AWS_SECRET_KEY}
85+
region:
86+
static: ${AWS_REGION}
87+
s3:
88+
bucket: ${AWS_S3_BUCKET}
89+
presigned-url-expiration: ${AWS_S3_PRESIGNED_EXPIRATION}
90+
91+
oauth:
92+
kakao:
93+
admin-key: ${KAKAO_ADMIN_KEY}
94+
unlink-uri: https://kapi.kakao.com/v1/user/unlink
95+
6396
redisson:
6497
config:
6598
singleServerConfig:
66-
address: "redis://localhost:6379"
99+
address: redis://${REDIS_HOST}:${REDIS_PORT}
67100

68101
chat:
69102
broker: rabbit # or simple

โ€Žsrc/main/resources/application-prod.ymlโ€Ž

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
spring:
2+
config:
3+
import: optional:file:.env.local[.properties]
4+
5+
datasource-meta:
6+
driver-class-name: com.mysql.cj.jdbc.Driver
7+
jdbc-url: jdbc:mysql://${AWS_RDS_HOST}:${AWS_RDS_PORT}/${AWS_RDS_META_DB_NAME}
8+
username: ${AWS_RDS_USERNAME}
9+
password: ${AWS_RDS_PASSWORD}
10+
11+
datasource-data:
12+
driver-class-name: com.mysql.cj.jdbc.Driver
13+
jdbc-url: jdbc:mysql://${AWS_RDS_HOST}:${AWS_RDS_PORT}/${AWS_RDS_DB_NAME}
14+
username: ${AWS_RDS_USERNAME}
15+
password: ${AWS_RDS_PASSWORD}
16+
17+
jpa:
18+
hibernate:
19+
ddl-auto: none
20+
properties:
21+
hibernate:
22+
show_sql: true
23+
format_sql: true
24+
use_sql_comments: true
25+
dialect: org.hibernate.dialect.MySQLDialect
26+
27+
jpa-data:
28+
hibernate:
29+
ddl-auto: none
30+
show-sql: true
31+
32+
data:
33+
redis:
34+
host: localhost
35+
port: 6379
36+
37+
elasticsearch:
38+
uris: ${ELASTICSEARCH_URIS}
39+
40+
cache:
41+
type: redis
42+
43+
rabbitmq:
44+
host: ${RABBITMQ_HOST}
45+
port: ${RABBITMQ_PORT}
46+
username: ${RABBITMQ_USER}
47+
password: ${RABBITMQ_PASSWORD}
48+
ssl:
49+
enabled: ${RABBITMQ_SSL}
50+
51+
data:
52+
redis:
53+
host: ${REDIS_HOST}
54+
port: ${REDIS_PORT}
55+
ssl:
56+
enabled: true
57+
58+
elasticsearch:
59+
uris: ${ELASTICSEARCH_URIS}
60+
61+
cache:
62+
type: redis
63+
64+
rabbitmq:
65+
host: ${RABBITMQ_HOST}
66+
port: ${RABBITMQ_PORT}
67+
username: ${RABBITMQ_USER}
68+
password: ${RABBITMQ_PASSWORD}
69+
ssl:
70+
enabled: true
71+
72+
jwt:
73+
secret:
74+
key: ${JWT_SECRET_KEY}
75+
76+
toss:
77+
secret:
78+
key: ${TOSS_SECRET_KEY}
79+
80+
cloud:
81+
aws:
82+
credentials:
83+
accessKey: ${AWS_ACCESS_KEY}
84+
secretKey: ${AWS_SECRET_KEY}
85+
region:
86+
static: ${AWS_REGION}
87+
s3:
88+
bucket: ${AWS_S3_BUCKET}
89+
presigned-url-expiration: ${AWS_S3_PRESIGNED_EXPIRATION}
90+
91+
oauth:
92+
kakao:
93+
admin-key: ${KAKAO_ADMIN_KEY}
94+
unlink-uri: https://kapi.kakao.com/v1/user/unlink
95+
96+
redisson:
97+
config:
98+
singleServerConfig:
99+
address: redis://${REDIS_HOST}:${REDIS_PORT}
100+
101+
chat:
102+
broker: rabbit # or simple
103+
104+

โ€Žsrc/main/resources/application-test.ymlโ€Ž

Lines changed: 60 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,17 @@ spring:
22
config:
33
import: optional:file:.env.test[.properties]
44

5-
batch:
6-
job:
7-
enabled: false
8-
jdbc:
9-
initialize-schema: always
10-
schema: classpath:org/springframework/batch/core/schema-mysql.sql
11-
125
datasource-meta:
136
driver-class-name: com.mysql.cj.jdbc.Driver
14-
jdbc-url: ${DB_URL_META}
15-
username: ${DB_USER_META}
16-
password: ${DB_PASSWORD_META}
7+
jdbc-url: jdbc:mysql://${AWS_RDS_HOST}:${AWS_RDS_PORT}/${AWS_RDS_META_DB_NAME}
8+
username: ${AWS_RDS_USERNAME}
9+
password: ${AWS_RDS_PASSWORD}
1710

1811
datasource-data:
1912
driver-class-name: com.mysql.cj.jdbc.Driver
20-
jdbc-url: ${DB_URL_DATA}
21-
username: ${DB_USER_DATA}
22-
password: ${DB_PASSWORD_DATA}
23-
24-
cloud:
25-
aws:
26-
region:
27-
static: ap-northeast-2
13+
jdbc-url: jdbc:mysql://${AWS_RDS_HOST}:${AWS_RDS_PORT}/${AWS_RDS_DB_NAME}
14+
username: ${AWS_RDS_USERNAME}
15+
password: ${AWS_RDS_PASSWORD}
2816

2917
jpa:
3018
hibernate:
@@ -53,15 +41,64 @@ spring:
5341
type: redis
5442

5543
rabbitmq:
56-
host: localhost
57-
port: 5672
44+
host: ${RABBITMQ_HOST}
45+
port: ${RABBITMQ_PORT}
46+
username: ${RABBITMQ_USER}
47+
password: ${RABBITMQ_PASSWORD}
48+
ssl:
49+
enabled: ${RABBITMQ_SSL}
50+
51+
data:
52+
redis:
53+
host: ${REDIS_HOST}
54+
port: ${REDIS_PORT}
55+
ssl:
56+
enabled: true
57+
58+
elasticsearch:
59+
uris: ${ELASTICSEARCH_URIS}
60+
61+
cache:
62+
type: redis
63+
64+
rabbitmq:
65+
host: ${RABBITMQ_HOST}
66+
port: ${RABBITMQ_PORT}
5867
username: ${RABBITMQ_USER}
5968
password: ${RABBITMQ_PASSWORD}
69+
ssl:
70+
enabled: true
71+
72+
jwt:
73+
secret:
74+
key: ${JWT_SECRET_KEY}
75+
76+
toss:
77+
secret:
78+
key: ${TOSS_SECRET_KEY}
79+
80+
cloud:
81+
aws:
82+
credentials:
83+
accessKey: ${AWS_ACCESS_KEY}
84+
secretKey: ${AWS_SECRET_KEY}
85+
region:
86+
static: ${AWS_REGION}
87+
s3:
88+
bucket: ${AWS_S3_BUCKET}
89+
presigned-url-expiration: ${AWS_S3_PRESIGNED_EXPIRATION}
90+
91+
oauth:
92+
kakao:
93+
admin-key: ${KAKAO_ADMIN_KEY}
94+
unlink-uri: https://kapi.kakao.com/v1/user/unlink
6095

6196
redisson:
62-
config: |
97+
config:
6398
singleServerConfig:
64-
address: "redis://localhost:6379"
99+
address: redis://${REDIS_HOST}:${REDIS_PORT}
65100

66101
chat:
67-
broker: rabbit # or simple
102+
broker: rabbit # or simple
103+
104+

0 commit comments

Comments
ย (0)