Skip to content

Commit f8770a0

Browse files
committed
[fix/#38] cors url 추가
1 parent 757f8be commit f8770a0

File tree

5 files changed

+9
-31
lines changed

5 files changed

+9
-31
lines changed

Dockerfile

+1-12
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@ FROM openjdk:17
22
ARG JAR_FILE=build/libs/*.jar
33
COPY ${JAR_FILE} app.jar
44

5-
ARG apm_agent=apm-agent/*.jar
6-
COPY ${apm_agent} apm-agent.jar
7-
8-
ARG PROFILE=dev
95
ENV SPRING_PROFILES_ACTIVE=${PROFILE}
106

11-
ENTRYPOINT ["java", \
12-
"-javaagent:/apm-agent.jar", \
13-
"-Delastic.apm.server_urls=http://apm-server:8200", \
14-
"-Delastic.apm.service_name=moplus-apm-agent", \
15-
"-Delastic.apm.application_packages=com.server", \
16-
"-Delastic.apm.environment=dev", \
17-
"-jar", \
18-
"/app.jar"]
7+
ENTRYPOINT ["java", "-jar", "app.jar"]

Dockerfile.prod

+1-12
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@ FROM openjdk:17
22
ARG JAR_FILE=build/libs/*.jar
33
COPY ${JAR_FILE} app.jar
44

5-
ARG apm_agent=apm-agent/*.jar
6-
COPY ${apm_agent} apm-agent.jar
7-
8-
ARG PROFILE=dev
95
ENV SPRING_PROFILES_ACTIVE=${PROFILE}
106

11-
ENTRYPOINT ["java", \
12-
"-javaagent:/apm-agent.jar", \
13-
"-Delastic.apm.server_urls=http://apm-server:8200", \
14-
"-Delastic.apm.service_name=moplus-apm-agent", \
15-
"-Delastic.apm.application_packages=com.server", \
16-
"-Delastic.apm.environment=prod", \
17-
"-jar", \
18-
"/app.jar"]
7+
ENTRYPOINT ["java", "-jar", "app.jar"]

docker-compose-dev.yml

-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ services:
2828
networks:
2929
- moplus-dev
3030
- nginx-network
31-
- apm_env
3231

3332
mysql:
3433
image: mysql:8.0
@@ -56,6 +55,4 @@ networks:
5655
moplus-dev:
5756
driver: bridge
5857
nginx-network:
59-
external: true
60-
apm_env:
6158
external: true

docker-compose-prod.yml

-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ services:
2727
networks:
2828
- moplus-prod
2929
- nginx-network
30-
- apm_env
3130

3231
mysql:
3332
image: mysql:8.0
@@ -50,6 +49,4 @@ networks:
5049
moplus-prod:
5150
driver: bridge
5251
nginx-network:
53-
external: true
54-
apm_env:
5552
external: true

src/main/resources/application.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,10 @@ spring:
1313

1414
cors-allowed-origins:
1515
http://localhost:8080,
16-
http://localhost:3000,
16+
https://dev.mopl.kr,
17+
http://dev.mopl.kr,
18+
https://prod.mopl.kr,
19+
http://prod.mopl.kr,
20+
http://localhost:3000,
21+
https://www.mopl.kr,
22+
http://www.mopl.kr

0 commit comments

Comments
 (0)