Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,6 @@ FROM openjdk:17
ARG JAR_FILE=build/libs/*.jar
COPY ${JAR_FILE} app.jar

ARG apm_agent=apm-agent/*.jar
COPY ${apm_agent} apm-agent.jar

ARG PROFILE=dev
ENV SPRING_PROFILES_ACTIVE=${PROFILE}

ENTRYPOINT ["java", \
"-javaagent:/apm-agent.jar", \
"-Delastic.apm.server_urls=http://apm-server:8200", \
"-Delastic.apm.service_name=moplus-apm-agent", \
"-Delastic.apm.application_packages=com.server", \
"-Delastic.apm.environment=dev", \
"-jar", \
"/app.jar"]
ENTRYPOINT ["java", "-jar", "app.jar"]
13 changes: 1 addition & 12 deletions Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,6 @@ FROM openjdk:17
ARG JAR_FILE=build/libs/*.jar
COPY ${JAR_FILE} app.jar

ARG apm_agent=apm-agent/*.jar
COPY ${apm_agent} apm-agent.jar

ARG PROFILE=dev
ENV SPRING_PROFILES_ACTIVE=${PROFILE}

ENTRYPOINT ["java", \
"-javaagent:/apm-agent.jar", \
"-Delastic.apm.server_urls=http://apm-server:8200", \
"-Delastic.apm.service_name=moplus-apm-agent", \
"-Delastic.apm.application_packages=com.server", \
"-Delastic.apm.environment=prod", \
"-jar", \
"/app.jar"]
ENTRYPOINT ["java", "-jar", "app.jar"]
3 changes: 0 additions & 3 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ services:
networks:
- moplus-dev
- nginx-network
- apm_env

mysql:
image: mysql:8.0
Expand Down Expand Up @@ -56,6 +55,4 @@ networks:
moplus-dev:
driver: bridge
nginx-network:
external: true
apm_env:
external: true
3 changes: 0 additions & 3 deletions docker-compose-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ services:
networks:
- moplus-prod
- nginx-network
- apm_env

mysql:
image: mysql:8.0
Expand All @@ -50,6 +49,4 @@ networks:
moplus-prod:
driver: bridge
nginx-network:
external: true
apm_env:
external: true
8 changes: 7 additions & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,10 @@ spring:

cors-allowed-origins:
http://localhost:8080,
http://localhost:3000,
https://dev.mopl.kr,
http://dev.mopl.kr,
https://prod.mopl.kr,
http://prod.mopl.kr,
http://localhost:3000,
https://www.mopl.kr,
http://www.mopl.kr