[#89] fix env var ignoring bug
This commit is contained in:
parent
558dcdb524
commit
a01b34d9fe
|
@ -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}
|
||||
|
|
|
@ -4,8 +4,6 @@ LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
|
|||
|
||||
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/
|
||||
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -4,8 +4,6 @@ LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
|
|||
|
||||
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
|
||||
|
|
|
@ -4,8 +4,6 @@ LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
|
|||
|
||||
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
|
||||
|
|
|
@ -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}
|
||||
|
|
Loading…
Reference in New Issue