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

[#89] fix env var ignoring bug

This commit is contained in:
Roy Kim 2020-10-12 22:21:33 +09:00 committed by Roy Kim
parent 558dcdb524
commit a01b34d9fe
6 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker-compose.yml
View File

@ -76,9 +76,8 @@ services:
- "9997:9997" - "9997:9997"
- "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}" - "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}"
environment: environment:
- JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES},batch"
- SERVER_PORT=${SERVER_PORT} - SERVER_PORT=${SERVER_PORT}
- SPRING_PROFILES=${SPRING_PROFILES} - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS} - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
- CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ENABLE=${CLUSTER_ENABLE}
- ADMIN_PASSWORD=${ADMIN_PASSWORD} - ADMIN_PASSWORD=${ADMIN_PASSWORD}
@ -141,8 +140,7 @@ services:
networks: networks:
- pinpoint - pinpoint
environment: environment:
- JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES}" - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
- SPRING_PROFILES=${SPRING_PROFILES}
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS} - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
- CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ENABLE=${CLUSTER_ENABLE}
- LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT} - LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
@ -184,7 +182,6 @@ services:
volumes: volumes:
- data-volume:/pinpoint-agent - data-volume:/pinpoint-agent
environment: environment:
- SPRING_PROFILES=${SPRING_PROFILES}
- COLLECTOR_IP=${COLLECTOR_IP} - COLLECTOR_IP=${COLLECTOR_IP}
- PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT} - PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}
- PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT} - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}

2
pinpoint-agent/Dockerfile
View File

@ -4,8 +4,6 @@ LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0} 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 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/ COPY /build/scripts/configure-agent.sh /usr/local/bin/

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

@ -17,7 +17,6 @@ services:
volumes: volumes:
- pinpoint-agent - pinpoint-agent
environment: environment:
- SPRING_PROFILES=${SPRING_PROFILES}
- COLLECTOR_IP=${COLLECTOR_IP} - COLLECTOR_IP=${COLLECTOR_IP}
- PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT} - PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}
- PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT} - PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}

2
pinpoint-collector/Dockerfile
View File

@ -4,8 +4,6 @@ LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0} 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 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 \ RUN mkdir -p /pinpoint/config \
&& mkdir -p /pinpoint/scripts && mkdir -p /pinpoint/scripts

2
pinpoint-web/Dockerfile
View File

@ -4,8 +4,6 @@ LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.1.0} 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 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 \ RUN mkdir -p /pinpoint/config \
&& mkdir -p /pinpoint/scripts && mkdir -p /pinpoint/scripts

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

@ -19,9 +19,8 @@ services:
- "9997:9997" - "9997:9997"
- "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}" - "${SERVER_PORT:-8080}:${SERVER_PORT:-8080}"
environment: environment:
- JAVA_OPTS="-Dspring.profiles.active=${SPRING_PROFILES},batch"
- SERVER_PORT=${SERVER_PORT} - SERVER_PORT=${SERVER_PORT}
- SPRING_PROFILES=${SPRING_PROFILES} - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS} - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
- CLUSTER_ENABLE=${CLUSTER_ENABLE} - CLUSTER_ENABLE=${CLUSTER_ENABLE}
- ADMIN_PASSWORD=${ADMIN_PASSWORD} - ADMIN_PASSWORD=${ADMIN_PASSWORD}