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

Compare commits

base: home/docker-pinpoint:1.1.0
Branches Tags
home/docker-pinpoint:master
home/docker-pinpoint:1.6.1 home/docker-pinpoint:1.6.2 home/docker-pinpoint:1.6.0 home/docker-pinpoint:1.5.2 home/docker-pinpoint:1.5.1 home/docker-pinpoint:1.5.0 home/docker-pinpoint:1.1.1 home/docker-pinpoint:1.1.0
..
compare: home/docker-pinpoint:1.1.1
Branches Tags
home/docker-pinpoint:master
home/docker-pinpoint:1.6.1 home/docker-pinpoint:1.6.2 home/docker-pinpoint:1.6.0 home/docker-pinpoint:1.5.2 home/docker-pinpoint:1.5.1 home/docker-pinpoint:1.5.0 home/docker-pinpoint:1.1.1 home/docker-pinpoint:1.1.0
8 Commits
1.1.0 .. 1.1.1
Author SHA1 Message Date
Dawid Malinowski 483f93f5ed Clean curl 2015-10-05 21:17:25 +02:00
Dawid Malinowski 36c659a70f Merge branch 'master' into 1.1.1 2015-10-05 21:15:08 +02:00
Dawid Malinowski bf45886c00 Merge remote-tracking branch 'origin/1.1.0' 2015-10-05 21:11:23 +02:00
Dawid Malinowski 74bed065bf Update Dockerfile 2015-10-05 20:59:04 +02:00
Dawid Malinowski e93d75ee01 Update Dockerfile 2015-10-05 20:58:53 +02:00
Dawid Malinowski 9dff0c9a33 Bump hbase to 1.0.2 2015-09-09 14:06:00 +01:00
Dawid Malinowski 915df2db5e Bump hbase to 1.0.2 2015-09-09 14:05:27 +01:00
Dawid Malinowski 700bd364fd Bump to 1.1.1 2015-09-09 13:10:29 +01:00
4 changed files with 21 additions and 18 deletions
Expand all files Collapse all files
pinpoint-agent/Dockerfile
+5 -3
View File
@@ -4,7 +4,7 @@
FROM alpine:3.2
ENV PINPOINT_VERSION 1.1.0
ENV PINPOINT_VERSION 1.1.1
RUN apk add --update curl bash
@@ -12,11 +12,13 @@ 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 \
&& gunzip pinpoint-agent-$PINPOINT_VERSION.tar.gz \
&& tar -xf pinpoint-agent-$PINPOINT_VERSION.tar -C /opt/app \
&& rm pinpoint-agent-$PINPOINT_VERSION.tar
&& rm pinpoint-agent-$PINPOINT_VERSION.tar \
&& apk del curl \
&& rm /var/cache/apk/*
ADD configure.sh /configure.sh
RUN chmod a+x /configure.sh
VOLUME /opt/app/pinpoint-agent
CMD ["/configure.sh"]
CMD ["/configure.sh"]
pinpoint-collector/Dockerfile
+1 -1
View File
@@ -4,7 +4,7 @@
FROM tomcat:8-jre8
ENV PINPOINT_VERSION 1.1.0
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 \
pinpoint-hbase/Dockerfile
+14 -13
View File
@@ -5,23 +5,23 @@
FROM java:8-jdk
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
ENV HBASE_VERSION 1.0.1.1
ENV HBASE_VERSION 1.0.2
ENV HBASE_HOME /opt/hbase/hbase-$HBASE_VERSION
ENV PINPOINT_VERSION 1.1.0
ENV PINPOINT_VERSION 1.1.1
RUN mkdir -p /opt/hbase \
&& cd /opt/hbase \
&& curl -SL "http://apache.mirrors.pair.com/hbase/$HBASE_VERSION/hbase-$HBASE_VERSION-bin.tar.gz" -o hbase.tar.gz \
&& tar xfvz hbase.tar.gz \
&& rm -rf hbase.tar.gz
RUN mkdir -p /opt/hbase && \
cd /opt/hbase && \
curl -SL "http://apache.mirrors.pair.com/hbase/hbase-$HBASE_VERSION/hbase-$HBASE_VERSION-bin.tar.gz" -o hbase.tar.gz && \
tar xfvz hbase.tar.gz && \
rm -rf hbase.tar.gz
ADD hbase-site.xml /opt/hbase/hbase-$HBASE_VERSION/conf/hbase-site.xml
RUN curl -SL "https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/scripts/hbase-create.hbase" -o /opt/hbase/hbase-create.hbase \
&& $HBASE_HOME/bin/start-hbase.sh \
&& sleep 10 \
&& $HBASE_HOME/bin/hbase shell /opt/hbase/hbase-create.hbase \
&& $HBASE_HOME/bin/stop-hbase.sh
RUN curl -SL "https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/scripts/hbase-create.hbase" -o /opt/hbase/hbase-create.hbase && \
$HBASE_HOME/bin/start-hbase.sh && \
sleep 10 && \
$HBASE_HOME/bin/hbase shell /opt/hbase/hbase-create.hbase && \
$HBASE_HOME/bin/stop-hbase.sh
VOLUME /home/pinpoint/hbase
VOLUME /home/pinpoint/zookeeper
@@ -37,4 +37,5 @@ EXPOSE 60020
# HBase Regionserver web UI
EXPOSE 60030
CMD ["/opt/hbase/hbase-$HBASE_VERSION/bin/hbase", "master", "start"]
CMD /opt/hbase/hbase-$HBASE_VERSION/bin/hbase master start
pinpoint-web/Dockerfile
+1 -1
View File
@@ -4,7 +4,7 @@
FROM tomcat:8-jre8
ENV PINPOINT_VERSION 1.1.0
ENV PINPOINT_VERSION 1.1.1
ADD start.sh /usr/local/tomcat/start.sh
ADD hbase.properties /assets/hbase.properties