[#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

View File

@@ -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

View File

@@ -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}