From 3ea606f5dfc4eeb060bebad00fc90ee9abccfa90 Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Tue, 17 Mar 2020 17:30:41 +0900 Subject: [PATCH] [#naver/pinpoint#6598] add missing spring profile arg --- docker-compose.yml | 4 +++- pinpoint-quickstart/docker-compose.yml | 2 +- pinpoint-web/.env | 1 + pinpoint-web/docker-compose.yml | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b096ed4..956db61 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,6 +80,7 @@ services: - "9997:9997" - "${WEB_PAGE_PORT:-8080}:8080" environment: + - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}" - SPRING_PROFILES=${SPRING_PROFILES} - CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS} @@ -137,6 +138,7 @@ services: networks: - pinpoint environment: + - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}" - SPRING_PROFILES=${SPRING_PROFILES} - CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS} @@ -158,7 +160,7 @@ services: volumes: - data-volume:/pinpoint-agent 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: - pinpoint depends_on: diff --git a/pinpoint-quickstart/docker-compose.yml b/pinpoint-quickstart/docker-compose.yml index 973a490..cd2fa83 100644 --- a/pinpoint-quickstart/docker-compose.yml +++ b/pinpoint-quickstart/docker-compose.yml @@ -13,7 +13,7 @@ services: volumes: - data-volume:/pinpoint-agent 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: - pinpoint depends_on: diff --git a/pinpoint-web/.env b/pinpoint-web/.env index 4c9304d..069a3fc 100644 --- a/pinpoint-web/.env +++ b/pinpoint-web/.env @@ -4,6 +4,7 @@ SPRING_PROFILES=release ### Pinpoint-Web PINPOINT_WEB_NAME=pinpoint-web +SPRING_PROFILES=release WEB_PAGE_PORT=8079 diff --git a/pinpoint-web/docker-compose.yml b/pinpoint-web/docker-compose.yml index 2d3a961..67576eb 100644 --- a/pinpoint-web/docker-compose.yml +++ b/pinpoint-web/docker-compose.yml @@ -19,6 +19,7 @@ services: - "9997:9997" - "${WEB_PAGE_PORT:-8080}:8080" environment: + - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}" - SPRING_PROFILES=${SPRING_PROFILES} - CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ZOOKEEPER_ADDRESS=${CLUSTER_ZOOKEEPER_ADDRESS}