home/docker-pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/docker-pinpoint.git synced 2026-08-09 04:46:24 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.1.0'

Browse Source
This commit is contained in:
Dawid Malinowski
2015-10-05 21:11:23 +02:00
parent e93d75ee01 83fe2cc207
commit bf45886c00
6 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pinpoint-agent/Dockerfile
+7 -4
View File
@@ -2,11 +2,11 @@
# TO_BUILD docker build -t pinpoint-agent .
# TO_RUN docker run --name=pinpoint-agent pinpoint-agent
FROM java:8-jdk
FROM alpine:3.2
ENV PINPOINT_VERSION 1.1.1
#RUN opkg-install bash curl
RUN apk add --update curl bash
RUN mkdir -p /opt/app \
&& curl -L -O -k "https://github.com/naver/pinpoint/releases/download/$PINPOINT_VERSION/pinpoint-agent-$PINPOINT_VERSION.tar.gz" -o pinpoint-agent.tar.gz \
@@ -14,6 +14,9 @@ RUN mkdir -p /opt/app \
&& tar -xf pinpoint-agent-$PINPOINT_VERSION.tar -C /opt/app \
&& rm pinpoint-agent-$PINPOINT_VERSION.tar
RUN sed -i 's/profiler.collector.ip=127.0.0.1/profiler.collector.ip=192.168.59.103/' /opt/app/pinpoint-agent/pinpoint.config
ADD configure.sh /configure.sh
RUN chmod a+x /configure.sh
ENTRYPOINT ["bash"]
VOLUME /opt/app/pinpoint-agent
CMD ["/configure.sh"]
pinpoint-agent/configure.sh
+7
View File
@@ -0,0 +1,7 @@
#!/bin/bash
set -e
set -x
COLLECTOR_IP=${COLLECTOR_IP:-}
sed -i 's/profiler.collector.ip=127.0.0.1/profiler.collector.ip='"${COLLECTOR_IP}"'/' /opt/app/pinpoint-agent/pinpoint.config
pinpoint-collector/Dockerfile
+9 -9
View File
@@ -6,15 +6,15 @@ FROM tomcat:8-jre8
ENV PINPOINT_VERSION 1.1.1
RUN 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 && \
sed -i -e 's/8080/9080/' /usr/local/tomcat/conf/server.xml && \
sed -i -e 's/8009/9009/' /usr/local/tomcat/conf/server.xml && \
sed -i -e 's/8443/9443/' /usr/local/tomcat/conf/server.xml && \
unzip pinpoint-collector.war -d /usr/local/tomcat/webapps/ROOT && \
rm -rf pinpoint-collector.war
RUN 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 \
&& sed -i -e 's/8080/9080/' /usr/local/tomcat/conf/server.xml \
&& sed -i -e 's/8009/9009/' /usr/local/tomcat/conf/server.xml \
&& sed -i -e 's/8443/9443/' /usr/local/tomcat/conf/server.xml \
&& unzip pinpoint-collector.war -d /usr/local/tomcat/webapps/ROOT \
&& rm -rf pinpoint-collector.war
ADD start.sh /usr/local/tomcat/start.sh
RUN chmod a+x /usr/local/tomcat/start.sh
pinpoint-hbase/Dockerfile
+1
View File
@@ -38,3 +38,4 @@ EXPOSE 60020
EXPOSE 60030
CMD /opt/hbase/hbase-$HBASE_VERSION/bin/hbase master start
pinpoint-web/Dockerfile
+7 -8
View File
@@ -6,18 +6,17 @@ FROM tomcat:8-jre8
ENV PINPOINT_VERSION 1.1.1
RUN 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 && \
rm -rf pinpoint-web.war
ADD start.sh /usr/local/tomcat/start.sh
RUN chmod a+x /usr/local/tomcat/start.sh
ADD hbase.properties /assets/hbase.properties
ADD pinpoint-web.properties /assets/pinpoint-web.properties
RUN chmod a+x /usr/local/tomcat/start.sh\
&& 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 \
&& rm -rf pinpoint-web.war
EXPOSE 8080
CMD ["/usr/local/tomcat/start.sh"]
pinpoint-web/pinpoint-web.properties
+2 -3
View File
@@ -1,9 +1,8 @@
# local
cluster.enable=false
cluster.web.tcp.port=9995
cluster.zookeeper.address=127.0.0.1:22213
cluster.zookeeper.sessiontimeout=3000
cluster.zookeeper.retry.interval=5000
cluster.zookeeper.address=
cluster.zookeeper.sessiontimeout=
# FIXME - should be removed for proper authentication
admin.password=admin