Skip to content

Commit af9bec1

Browse files
committed
수정: 퍼블릭주소, yml변경
1 parent be3d832 commit af9bec1

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

docker-compose.yml

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ services:
1111
depends_on:
1212
- mysqldb
1313
- redis
14+
env_file:
15+
- .env
1416
environment:
1517
- SPRING_PROFILES_ACTIVE=docker
1618
networks:
@@ -61,32 +63,32 @@ services:
6163
networks:
6264
- app-tier
6365

64-
prometheus:
65-
user: "root"
66-
image: prom/prometheus
67-
container_name: prometheus_container
68-
volumes:
69-
- /home/ubuntu/WEB5_7_3star_BE/prometheus-grafana/prometheus/config:/etc/prometheus
70-
- /home/ubuntu/WEB5_7_3star_BE/prometheus-grafana/prometheus/volume:/prometheus/data
71-
ports:
72-
- 9090:9090
73-
command:
74-
- '--config.file=/etc/prometheus/prometheus.yml'
75-
restart: always
76-
networks:
77-
- app-tier
78-
79-
grafana:
80-
user: "root"
81-
image: grafana/grafana
82-
container_name: grafana_container
83-
ports:
84-
- 3000:3000
85-
volumes:
86-
- ./grafana/volume:/var/lib/grafana
87-
restart: always
88-
networks:
89-
- app-tier
66+
# prometheus:
67+
# user: "root"
68+
# image: prom/prometheus
69+
# container_name: prometheus_container
70+
# volumes:
71+
# - /home/ubuntu/WEB5_7_3star_BE/prometheus-grafana/prometheus/config:/etc/prometheus
72+
# - /home/ubuntu/WEB5_7_3star_BE/prometheus-grafana/prometheus/volume:/prometheus/data
73+
# ports:
74+
# - 9090:9090
75+
# command:
76+
# - '--config.file=/etc/prometheus/prometheus.yml'
77+
# restart: always
78+
# networks:
79+
# - app-tier
80+
#
81+
# grafana:
82+
# user: "root"
83+
# image: grafana/grafana
84+
# container_name: grafana_container
85+
# ports:
86+
# - 3000:3000
87+
# volumes:
88+
# - ./grafana/volume:/var/lib/grafana
89+
# restart: always
90+
# networks:
91+
# - app-tier
9092

9193
volumes:
9294
mysqldb-data:

src/main/java/com/threestar/trainus/global/config/CorsConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ public void addCorsMappings(CorsRegistry registry) {
1212
.allowedOrigins("http://localhost:3000",
1313
"http://localhost:8080",
1414
"http://localhost:8031",
15-
"http://43.202.206.47:8080",
16-
"http://43.202.206.47:3000",
17-
"http://43.202.206.47:8031")
15+
"http://15.165.184.145:8080",
16+
"http://15.165.184.145:3000",
17+
"http://15.165.184.145:8031")
1818
.allowCredentials(true) // 쿠키 허용
1919
.allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
2020
.allowedHeaders("*");

0 commit comments

Comments
 (0)