1.6.2

docker-compose-example-app.yml

@@ -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

@@ -1,69 +1,102 @@
-pinpoint-hbase:
+version: '2'
-  container_name: pinpoint-hbase
+services:
-  hostname: hbase
+  pinpoint-hbase:
-  image: wahyd4/pinpoint-hbase:1.6.1
+    container_name: pinpoint-hbase
-  restart: always
+    image: marcosamm/pinpoint-hbase:1.6.2
-  expose:
+    restart: always
-    - "2181"
+    expose:
-    - "16010"
+      - "2181"
-  ports:
+      - "16010"
-    - "2181:2181"
+    ports:
-    - "16010:16010"
+      - "2181:2181"
+      - "16010:16010"
+    environment:
+      TZ: "America/Recife"
+    volumes:
+      - hbase_data:/home/pinpoint/hbase
+      - hbase_zookeeper_data:/home/pinpoint/zookeeper
 
-pinpoint-collector:
+  pinpoint-mysql:
-  container_name: pinpoint-collector
+    container_name: pinpoint-mysql
-  hostname: collector
+    restart: always
-  image: wahyd4/pinpoint-collector:1.6.1
+    image: pinpointmysql:latest
-  restart: always
+    ports:
-  expose:
+      - "13306:3306"
-    - "9994"
+    environment:
-    - "9995"
+      MYSQL_ROOT_PASSWORD: root123
-    - "9996"
+      MYSQL_USER: admin
-  ports:
+      MYSQL_PASSWORD: admin
-    - "9994:9994"
+      MYSQL_DATABASE: pinpoint
-    - "9995:9995/tcp"
+      TZ: "America/Recife"
-    - "9996:9996/tcp"
+    volumes:
-    - "9995:9995/udp"
+      - mysql_data:/var/lib/mysql
-    - "9996:9996/udp"
+  
-  environment:
+  pinpoint-collector:
-    HBASE_HOST: hbase
+    depends_on:
-    HBASE_PORT: 2181
+      - pinpoint-hbase
-    COLLECTOR_TCP_PORT: 9994
+    container_name: pinpoint-collector
-    COLLECTOR_UDP_STAT_LISTEN_PORT: 9995
+    image: marcosamm/pinpoint-collector:1.6.2
-    COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996
+    restart: always
-    CLUSTER_ENABLE: 'false'
+    expose:
-    DISABLE_DEBUG: 'true'
+      - "9994"
-  links:
+      - "9995"
-    - pinpoint-hbase:hbase
+      - "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:
+volumes:
-  container_name: pinpoint-web
+  mysql_data:
-  hostname: web
+  hbase_data:
-  image: wahyd4/pinpoint-web:1.6.1
+  hbase_zookeeper_data:
-  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
 
-# only example
+#  only example
-#pinpoint-agent:
+#  pinpoint-agent:
-#  image: wahyd4/pinpoint-agent:1.6.1
+#    image: marcosamm/pinpoint-agent:1.6.2
-#  net: "none"
+#    net: "none"
-#  restart: unless-stopped
+#    restart: unless-stopped
-#  volumes:
+#    volumes:
-#    - /var/container_data/pinpoint-agent/log:/opt/app/pinpoint-agent/log:rw
+#      - /var/container_data/pinpoint-agent/log:/opt/app/pinpoint-agent/log:rw
-#  environment:
+#    environment:
-#    COLLECTOR_IP: 192.168.99.100
+#      COLLECTOR_IP: 192.168.99.100
-#    COLLECTOR_TCP_PORT: 9994
+#      COLLECTOR_TCP_PORT: 9994
-#    COLLECTOR_UDP_STAT_LISTEN_PORT: 9995
+#      COLLECTOR_UDP_STAT_LISTEN_PORT: 9995
-#    COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996
+#      COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996
-#    DISABLE_DEBUG: 'true'
+#      DISABLE_DEBUG: 'true'

pinpoint-agent/Dockerfile

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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"]
-