From 6cba1ae5f663a60e6af804e8c202a076242ced87 Mon Sep 17 00:00:00 2001 From: Dawid Malinowski Date: Tue, 24 Nov 2015 13:46:34 +0100 Subject: [PATCH] Revert "Fix curl" This reverts commit a47d5defce12c50cad4ada23f8db11770cb35e0e. --- pinpoint-agent/Dockerfile | 4 ++-- pinpoint-collector/Dockerfile | 6 +++--- pinpoint-web/Dockerfile | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index 93c2302..30186bf 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -12,8 +12,8 @@ RUN apk add --update curl bash \ && chmod a+x /configure.sh \ && mkdir -p /opt/app \ && mkdir -p /assets/ \ - && curl -SL "https://github.com/naver/pinpoint/blob/$PINPOINT_VERSION/agent/src/main/resources/pinpoint.config" -o /assets/pinpoint.config \ - && curl -SL "https://github.com/naver/pinpoint/releases/download/$PINPOINT_VERSION/pinpoint-agent-$PINPOINT_VERSION.tar.gz" -o pinpoint-agent-$PINPOINT_VERSION.tar.gz \ + && curl -SL https://github.com/naver/pinpoint/blob/$PINPOINT_VERSION/agent/src/main/resources/pinpoint.config -o /assets/pinpoint.config \ + && curl -SL https://github.com/naver/pinpoint/releases/download/$PINPOINT_VERSION/pinpoint-agent-$PINPOINT_VERSION.tar.gz -o pinpoint-agent-$PINPOINT_VERSION.tar.gz \ && gunzip pinpoint-agent-$PINPOINT_VERSION.tar.gz \ && tar -xf pinpoint-agent-$PINPOINT_VERSION.tar -C /opt/app \ && rm pinpoint-agent-$PINPOINT_VERSION.tar \ diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index 6a9b2dd..f58ef3a 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -10,9 +10,9 @@ ADD start.sh /usr/local/tomcat/start.sh RUN chmod a+x /usr/local/tomcat/start.sh \ && mkdir -p /assets/ \ - && curl -SL "https://github.com/naver/pinpoint/blob/$PINPOINT_VERSION/collector/src/main/resources/pinpoint-collector.properties" -o /assets/pinpoint-collector.properties \ - && curl -SL "https://github.com/naver/pinpoint/blob/$PINPOINT_VERSION/collector/src/main/resources/hbase.properties" -o /assets/hbase.properties \ - && curl -SL "https://github.com/naver/pinpoint/releases/download/$PINPOINT_VERSION/pinpoint-collector-$PINPOINT_VERSION.war" -o pinpoint-collector.war \ + && curl -SL https://github.com/naver/pinpoint/blob/$PINPOINT_VERSION/collector/src/main/resources/pinpoint-collector.properties -o /assets/pinpoint-collector.properties \ + && curl -SL https://github.com/naver/pinpoint/blob/$PINPOINT_VERSION/collector/src/main/resources/hbase.properties -o /assets/hbase.properties \ + && curl -SL https://github.com/naver/pinpoint/releases/download/$PINPOINT_VERSION/pinpoint-collector-$PINPOINT_VERSION.war -o pinpoint-collector.war \ && rm -rf /usr/local/tomcat/webapps \ && mkdir -p /usr/local/tomcat/webapps \ && sed -i -e 's/8005/9005/' /usr/local/tomcat/conf/server.xml \ diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index 436c521..98429ec 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -10,9 +10,9 @@ ADD start.sh /usr/local/tomcat/start.sh RUN chmod a+x /usr/local/tomcat/start.sh \ && mkdir -p /assets/ \ - && curl -SL "https://github.com/naver/pinpoint/blob/$PINPOINT_VERSION/web/src/main/resources/pinpoint-web.properties" -o /assets/pinpoint-web.properties \ - && curl -SL "https://github.com/naver/pinpoint/blob/$PINPOINT_VERSION/web/src/main/resources/hbase.properties" -o /assets/hbase.properties \ - && curl -SL "https://github.com/naver/pinpoint/releases/download/$PINPOINT_VERSION/pinpoint-web-$PINPOINT_VERSION.war" -o pinpoint-web.war \ + && curl -SL https://github.com/naver/pinpoint/blob/$PINPOINT_VERSION/web/src/main/resources/pinpoint-web.properties -o /assets/pinpoint-web.properties \ + && curl -SL https://github.com/naver/pinpoint/blob/$PINPOINT_VERSION/web/src/main/resources/hbase.properties -o /assets/hbase.properties \ + && curl -SL https://github.com/naver/pinpoint/releases/download/$PINPOINT_VERSION/pinpoint-web-$PINPOINT_VERSION.war -o pinpoint-web.war \ && rm -rf /usr/local/tomcat/webapps \ && mkdir -p /usr/local/tomcat/webapps \ && unzip pinpoint-web.war -d /usr/local/tomcat/webapps/ROOT \