From a01b34d9fe74dc538c6451fc5e2ee54e1984b9ee Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Mon, 12 Oct 2020 22:21:33 +0900 Subject: [PATCH] [#89] fix env var ignoring bug --- docker-compose.yml | 7 ++----- pinpoint-agent/Dockerfile | 2 -- pinpoint-agent/docker-compose.yml | 1 - pinpoint-collector/Dockerfile | 2 -- pinpoint-web/Dockerfile | 2 -- pinpoint-web/docker-compose.yml | 3 +-- 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2a8ef51..2c68177 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -76,9 +76,8 @@ services: - "9997:9997" - "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}" environment: - - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES},batch" - SERVER_PORT=${SERVER_PORT} - - SPRING_PROFILES=${SPRING_PROFILES} + - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS} - CLUSTER_ENABLE=${CLUSTER_ENABLE} - ADMIN_PASSWORD=${ADMIN_PASSWORD} @@ -141,8 +140,7 @@ services: networks: - pinpoint environment: - - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}" - - SPRING_PROFILES=${SPRING_PROFILES} + - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES} - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS} - CLUSTER_ENABLE=${CLUSTER_ENABLE} - LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT} @@ -184,7 +182,6 @@ services: volumes: - data-volume:/pinpoint-agent environment: - - SPRING_PROFILES=${SPRING_PROFILES} - COLLECTOR_IP=${COLLECTOR_IP} - PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT} - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT} diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index 00f8f49..1a5fa9d 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -4,8 +4,6 @@ LABEL maintainer="Roy Kim " ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz -ARG SPRING_PROFILES=${SPRING_PROFILES:-release} -ENV SPRING_PROFILES=$SPRING_PROFILES COPY /build/scripts/configure-agent.sh /usr/local/bin/ diff --git a/pinpoint-agent/docker-compose.yml b/pinpoint-agent/docker-compose.yml index 69235b1..5aca8fd 100644 --- a/pinpoint-agent/docker-compose.yml +++ b/pinpoint-agent/docker-compose.yml @@ -17,7 +17,6 @@ services: volumes: - pinpoint-agent environment: - - SPRING_PROFILES=${SPRING_PROFILES} - COLLECTOR_IP=${COLLECTOR_IP} - PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT} - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT} diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index 8b8b7d7..83204ba 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -4,8 +4,6 @@ LABEL maintainer="Roy Kim " ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar -ARG SPRING_PROFILES=${SPRING_PROFILES:-release} -ENV SPRING_PROFILES=$SPRING_PROFILES RUN mkdir -p /pinpoint/config \ && mkdir -p /pinpoint/scripts diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index 7f1e8d3..e2417d0 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -4,8 +4,6 @@ LABEL maintainer="Roy Kim " ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar -ARG SPRING_PROFILES=${SPRING_PROFILES:-release} -ENV SPRING_PROFILES=$SPRING_PROFILES RUN mkdir -p /pinpoint/config \ && mkdir -p /pinpoint/scripts diff --git a/pinpoint-web/docker-compose.yml b/pinpoint-web/docker-compose.yml index 616fef8..a322236 100644 --- a/pinpoint-web/docker-compose.yml +++ b/pinpoint-web/docker-compose.yml @@ -19,9 +19,8 @@ services: - "9997:9997" - "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}" environment: - - JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES},batch" - SERVER_PORT=${SERVER_PORT} - - SPRING_PROFILES=${SPRING_PROFILES} + - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS} - CLUSTER_ENABLE=${CLUSTER_ENABLE} - ADMIN_PASSWORD=${ADMIN_PASSWORD}