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

1.6.2

Browse Source
This commit is contained in:
Marcos Alexandre de Melo Medeiros
2017-07-11 12:16:38 -03:00
parent 5116f92218
commit c303777457
7 changed files with 114 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose-example-app.yml
+2 -2
View File
@@ -6,10 +6,10 @@ rancher-server:
ports:
- 8080:8080
environment:
JAVA_OPTS: "-javaagent:/assets/pinpoint-agent/pinpoint-bootstrap-1.6.1.jar -Dpinpoint.agentId=app-in-docker -Dpinpoint.applicationName=app"
JAVA_OPTS: "-javaagent:/assets/pinpoint-agent/pinpoint-bootstrap-1.6.2.jar -Dpinpoint.agentId=app-in-docker -Dpinpoint.applicationName=app"
pinpoint-agent:
image: wahyd4/pinpoint-agent:1.6.1
image: wahyd4/pinpoint-agent:1.6.2
net: "none"
restart: unless-stopped
# volumes:
docker-compose.yml
+99 -66
View File
@@ -1,69 +1,102 @@
pinpoint-hbase:
container_name: pinpoint-hbase
hostname: hbase
image: wahyd4/pinpoint-hbase:1.6.1
restart: always
expose:
- "2181"
- "16010"
ports:
- "2181:2181"
- "16010:16010"
version: '2'
services:
pinpoint-hbase:
container_name: pinpoint-hbase
image: marcosamm/pinpoint-hbase:1.6.2
restart: always
expose:
- "2181"
- "16010"
ports:
- "2181:2181"
- "16010:16010"
environment:
TZ: "America/Recife"
volumes:
- hbase_data:/home/pinpoint/hbase
- hbase_zookeeper_data:/home/pinpoint/zookeeper
pinpoint-collector:
container_name: pinpoint-collector
hostname: collector
image: wahyd4/pinpoint-collector:1.6.1
restart: always
expose:
- "9994"
- "9995"
- "9996"
ports:
- "9994:9994"
- "9995:9995/tcp"
- "9996:9996/tcp"
- "9995:9995/udp"
- "9996:9996/udp"
environment:
HBASE_HOST: hbase
HBASE_PORT: 2181
COLLECTOR_TCP_PORT: 9994
COLLECTOR_UDP_STAT_LISTEN_PORT: 9995
COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996
CLUSTER_ENABLE: 'false'
DISABLE_DEBUG: 'true'
links:
- pinpoint-hbase:hbase
pinpoint-mysql:
container_name: pinpoint-mysql
restart: always
image: pinpointmysql:latest
ports:
- "13306:3306"
environment:
MYSQL_ROOT_PASSWORD: root123
MYSQL_USER: admin
MYSQL_PASSWORD: admin
MYSQL_DATABASE: pinpoint
TZ: "America/Recife"
volumes:
- mysql_data:/var/lib/mysql
pinpoint-collector:
depends_on:
- pinpoint-hbase
container_name: pinpoint-collector
image: marcosamm/pinpoint-collector:1.6.2
restart: always
expose:
- "9994"
- "9995"
- "9996"
ports:
- "9994:9994"
- "9995:9995/tcp"
- "9996:9996/tcp"
- "9995:9995/udp"
- "9996:9996/udp"
environment:
HBASE_HOST: pinpoint-hbase
HBASE_PORT: 2181
COLLECTOR_TCP_PORT: 9994
COLLECTOR_UDP_STAT_LISTEN_PORT: 9995
COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996
CLUSTER_ENABLE: 'false'
CLUSTER_ZOOKEEPER_ADDRESS: pinpoint-hbase
DISABLE_DEBUG: 'true'
TZ: "America/Recife"
pinpoint-web:
depends_on:
- pinpoint-hbase
- pinpoint-mysql
container_name: pinpoint-web
image: marcosamm/pinpoint-web:1.6.2
restart: always
expose:
- "8080"
ports:
- "28080:8080"
environment:
HBASE_HOST: pinpoint-hbase
HBASE_PORT: 2181
CLUSTER_ENABLE: 'false'
CLUSTER_ZOOKEEPER_ADDRESS: pinpoint-hbase
ADMIN_PASSWORD: admin123
DISABLE_DEBUG: 'true'
JDBC_DRIVER: com.mysql.jdbc.Driver
JDBC_URL: jdbc:mysql://pinpoint-mysql:3306/pinpoint?characterEncoding=UTF-8
JDBC_USERNAME: admin
JDBC_PASSWORD: admin
TZ: "America/Recife"
pinpoint-web:
container_name: pinpoint-web
hostname: web
image: wahyd4/pinpoint-web:1.6.1
restart: always
expose:
- "8080"
ports:
- "28080:8080"
environment:
HBASE_HOST: hbase
HBASE_PORT: 2181
CLUSTER_ENABLE: 'false'
ADMIN_PASSWORD: admin123
DISABLE_DEBUG: 'true'
links:
- pinpoint-hbase:hbase
volumes:
mysql_data:
hbase_data:
hbase_zookeeper_data:
# only example
#pinpoint-agent:
# image: wahyd4/pinpoint-agent:1.6.1
# net: "none"
# restart: unless-stopped
# volumes:
# - /var/container_data/pinpoint-agent/log:/opt/app/pinpoint-agent/log:rw
# environment:
# COLLECTOR_IP: 192.168.99.100
# COLLECTOR_TCP_PORT: 9994
# COLLECTOR_UDP_STAT_LISTEN_PORT: 9995
# COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996
# DISABLE_DEBUG: 'true'
# only example
# pinpoint-agent:
# image: marcosamm/pinpoint-agent:1.6.2
# net: "none"
# restart: unless-stopped
# volumes:
# - /var/container_data/pinpoint-agent/log:/opt/app/pinpoint-agent/log:rw
# environment:
# COLLECTOR_IP: 192.168.99.100
# COLLECTOR_TCP_PORT: 9994
# COLLECTOR_UDP_STAT_LISTEN_PORT: 9995
# COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996
# DISABLE_DEBUG: 'true'
pinpoint-agent/Dockerfile
+1 -1
View File
@@ -4,7 +4,7 @@
FROM alpine:3.5
ENV PINPOINT_VERSION=1.6.1
ENV PINPOINT_VERSION=1.6.2
ADD configure-agent.sh /usr/local/bin/
pinpoint-collector/Dockerfile
+2 -2
View File
@@ -4,7 +4,7 @@
FROM tomcat:8-jre8
ENV PINPOINT_VERSION=1.6.1
ENV PINPOINT_VERSION=1.6.2
ADD start-collector.sh /usr/local/bin/
@@ -24,4 +24,4 @@ RUN chmod a+x /usr/local/bin/start-collector.sh \
EXPOSE 9994 9995 9996
ENTRYPOINT ["/usr/local/bin/start-collector.sh"]
ENTRYPOINT ["/usr/local/bin/start-collector.sh"]
pinpoint-hbase/Dockerfile
+2 -2
View File
@@ -7,7 +7,7 @@ FROM java:8-jdk
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
ENV HBASE_VERSION=1.2.3
ENV HBASE_HOME=/opt/hbase/hbase-$HBASE_VERSION
ENV PINPOINT_VERSION=1.6.1
ENV PINPOINT_VERSION=1.6.2
ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
@@ -38,4 +38,4 @@ EXPOSE 60020
# HBase Regionserver web UI
EXPOSE 16030
ENTRYPOINT /opt/hbase/hbase-$HBASE_VERSION/bin/hbase master start
ENTRYPOINT /opt/hbase/hbase-$HBASE_VERSION/bin/hbase master start
pinpoint-mysql/Dockerfile
+6
View File
@@ -0,0 +1,6 @@
FROM mysql:5.7
ENV PINPOINT_VERSION=1.6.2
ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql /docker-entrypoint-initdb.d
ADD https://raw.githubusercontent.com/naver/pinpoint/$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobReositorySchema-mysql.sql /docker-entrypoint-initdb.d
pinpoint-web/Dockerfile
+2 -3
View File
@@ -4,7 +4,7 @@
FROM tomcat:8-jre8
ENV PINPOINT_VERSION=1.6.1
ENV PINPOINT_VERSION=1.6.2
ADD start-web.sh /usr/local/bin/
@@ -20,5 +20,4 @@ RUN chmod a+x /usr/local/bin/start-web.sh \
EXPOSE 8080
ENTRYPOINT ["/usr/local/bin/start-web.sh"]
ENTRYPOINT ["/usr/local/bin/start-web.sh"]