From 3b8638280c53191cfbbb729e1cc2eeffc6b5c0f8 Mon Sep 17 00:00:00 2001 From: Roy Kim Date: Mon, 16 Mar 2020 11:39:47 +0900 Subject: [PATCH] [naver/pinpoint#6598] change download location --- pinpoint-agent/Dockerfile | 2 +- pinpoint-collector/Dockerfile | 16 ++++++++-------- pinpoint-web/Dockerfile | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index 0a2d779..0c7df4e 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.7 LABEL maintainer="Roy Kim " ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.1} -ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${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 COPY /build/scripts/configure-agent.sh /usr/local/bin/ diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index 2b41f27..85dc230 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -4,17 +4,17 @@ LABEL maintainer="Roy Kim " ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.1} -ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war +ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war COPY /build/scripts/start-collector.sh /usr/local/bin/ -RUN chmod a+x /usr/local/bin/start-collector.sh \ - && curl -SL ${INSTALL_URL} -o pinpoint-collector.war \ - && rm -rf /usr/local/tomcat/webapps \ - && mkdir -p /usr/local/tomcat/webapps \ - && unzip pinpoint-collector.war -d /usr/local/tomcat/webapps/ROOT \ - && rm -rf pinpoint-collector.war \ - && sed -i "s/8005/9005/g" /usr/local/tomcat/conf/server.xml \ +RUN chmod a+x /usr/local/bin/start-collector.sh +RUN curl -SL ${INSTALL_URL} -o pinpoint-collector.war +RUN rm -rf /usr/local/tomcat/webapps +RUN mkdir -p /usr/local/tomcat/webapps +RUN unzip pinpoint-collector.war -d /usr/local/tomcat/webapps/ROOT +RUN rm -rf pinpoint-collector.war +RUN sed -i "s/8005/9005/g" /usr/local/tomcat/conf/server.xml \ && sed -i "s/8080/9080/g" /usr/local/tomcat/conf/server.xml \ && sed -i "s/8009/9009/g" /usr/local/tomcat/conf/server.xml \ && sed -i "s/8443/9443/g" /usr/local/tomcat/conf/server.xml diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index 0a6d2bb..2e7170c 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -3,7 +3,7 @@ FROM tomcat:8-jre8 LABEL maintainer="Roy Kim " ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.1} -ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war +ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war COPY /build/scripts/start-web.sh /usr/local/bin/ COPY /build/mail.zip /assets/mail.zip