Revert "Fix curl"

This reverts commit a47d5defce.
This commit is contained in:
Dawid Malinowski
2015-11-24 13:46:34 +01:00
parent a47d5defce
commit 6cba1ae5f6
3 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -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 \
+3 -3
View File
@@ -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 \
+3 -3
View File
@@ -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 \