MyoaEngineering
/
pinpoint-docker-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#naver/pinpoint#6598] add missing spring profile arg

This commit is contained in:
Roy Kim 2020-03-17 17:30:41 +09:00 committed by Roy Kim
parent 34cbc98aee
commit 3ea606f5df
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -80,6 +80,7 @@ services:
- "9997:9997" - "9997:9997"
- "${WEB_PAGE_PORT:-8080}:8080" - "${WEB_PAGE_PORT:-8080}:8080"
environment: environment:
- JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}"
- SPRING_PROFILES=${SPRING_PROFILES} - SPRING_PROFILES=${SPRING_PROFILES}
- CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ENABLE=${CLUSTER_ENABLE}
- CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS} - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
@ -137,6 +138,7 @@ services:
networks: networks:
- pinpoint - pinpoint
environment: environment:
- JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}"
- SPRING_PROFILES=${SPRING_PROFILES} - SPRING_PROFILES=${SPRING_PROFILES}
- CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ENABLE=${CLUSTER_ENABLE}
- CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS} - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}
@ -158,7 +160,7 @@ services:
volumes: volumes:
- data-volume:/pinpoint-agent - data-volume:/pinpoint-agent
environment: environment:
JAVA_OPTS: "-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME}" JAVA_OPTS: "-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME} -Dpinpoint.profiler.profiles.active=${SPRING_PROFILES}"
networks: networks:
- pinpoint - pinpoint
depends_on: depends_on:

2
pinpoint-quickstart/docker-compose.yml
View File

@ -13,7 +13,7 @@ services:
volumes: volumes:
- data-volume:/pinpoint-agent - data-volume:/pinpoint-agent
environment: environment:
JAVA_OPTS: "-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME}" JAVA_OPTS: "-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME} -Dpinpoint.profiler.profiles.active=${SPRING_PROFILES}"
networks: networks:
- pinpoint - pinpoint
depends_on: depends_on:

1
pinpoint-web/.env
View File

@ -4,6 +4,7 @@ SPRING_PROFILES=release
### Pinpoint-Web ### Pinpoint-Web
PINPOINT_WEB_NAME=pinpoint-web PINPOINT_WEB_NAME=pinpoint-web
SPRING_PROFILES=release
WEB_PAGE_PORT=8079 WEB_PAGE_PORT=8079

1
pinpoint-web/docker-compose.yml
View File

@ -19,6 +19,7 @@ services:
- "9997:9997" - "9997:9997"
- "${WEB_PAGE_PORT:-8080}:8080" - "${WEB_PAGE_PORT:-8080}:8080"
environment: environment:
- JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}"
- SPRING_PROFILES=${SPRING_PROFILES} - SPRING_PROFILES=${SPRING_PROFILES}
- CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ENABLE=${CLUSTER_ENABLE}
- CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS} - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}