Merge pull request #2 from naver/master

Updating my fork
This commit is contained in:
Marcos Alexandre de Melo 2019-02-15 08:03:46 -03:00 committed by GitHub
commit 43fffb8d72
23 changed files with 43 additions and 23 deletions

2
.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=1.8.0
PINPOINT_VERSION=1.8.2
### Pinpoint-Hbase

View File

@ -13,6 +13,8 @@ It supports and helps you understand your application in a glance and allow you
## Supported Tags
- 1.8.2
- 1.8.1
- 1.8.0
- 1.7.3
- 1.7.2
@ -32,8 +34,16 @@ git clone https://github.com/naver/pinpoint-docker.git
cd pinpoint-docker
docker-compose pull && docker-compose up -d
```
If you'd like to bring up the previous release. Try with docker-compose file from other tags.
You can also just build the image with `docker-compose up -d` command without pulling the image. But you can reduce the time to 1/3 by just downloading them.
If you'd like to bring up a previous release. Try with docker-compose file from other tags.
```
git clone https://github.com/naver/pinpoint-docker.git
git checkout {tag}
cd pinpoint-docker
docker-compose pull && docker-compose up -d
```
You can also build the image with `docker-compose up -d` command without pulling the image. But you can reduce the time to 1/3 by just downloading them.
This will install and run all services required to run all features in Pinpoint in docker containers joined with same network.
- Pinpoint-Web Server

View File

@ -14,8 +14,8 @@ services:
- pinpoint
volumes:
- ./home/pinpoint/hbase
- ./home/pinpoint/zookeeper
- /home/pinpoint/hbase
- /home/pinpoint/zookeeper
expose:
# zookeeper
- "2181"
@ -44,7 +44,7 @@ services:
container_name: pinpoint-mysql
restart: always
# image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}"
image: "pinpointdocker/pinpoint-mysql:${PINPOINT_VERSION}"
hostname: pinpoint-mysql
ports:
- "13306:3306"

View File

@ -1,4 +1,4 @@
### Pinpoint with Java
PINPOINT_VERSION=1.8.0
PINPOINT_VERSION=1.8.2
AGENT_ID=app-in-docker
APP_NAME=quickapp

View File

@ -1,5 +1,5 @@
### Pinpoint with Tomcat
PINPOINT_VERSION=1.8.0
PINPOINT_VERSION=1.8.2
APP_PORT=8000
AGENT_ID=app-in-docker
APP_NAME=quickapp

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=1.8.0
PINPOINT_VERSION=1.8.2
### Pinpoint-Agent

View File

@ -2,7 +2,7 @@ FROM alpine:3.7
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.2}
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
COPY /build/scripts/configure-agent.sh /usr/local/bin/

View File

@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
## Supported Tags
- 1.8.2
- 1.8.1
- 1.8.0
- 1.7.3
- 1.7.2

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=1.8.0
PINPOINT_VERSION=1.8.2
### Pinpoint-Collector

View File

@ -2,7 +2,7 @@ FROM tomcat:8-jre8
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.2}
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war

View File

@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl
## Supported Tags
- 1.8.2
- 1.8.1
- 1.8.0
- 1.7.3
- 1.7.2

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=1.8.0
PINPOINT_VERSION=1.8.2
### Pinpoint-flink

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=1.8.0
PINPOINT_VERSION=1.8.2
### Pinpoint-Hbase

View File

@ -2,7 +2,7 @@ FROM java:8-jdk
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.2}
ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase

View File

@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
## Supported Tags
- 1.8.2
- 1.8.1
- 1.8.0
- 1.7.3
- 1.7.2

View File

@ -12,8 +12,8 @@ services:
image: "pinpointdocker/pinpoint-hbase:${PINPOINT_VERSION}"
volumes:
- ./home/pinpoint/hbase
- ./home/pinpoint/zookeeper
- /home/pinpoint/hbase
- /home/pinpoint/zookeeper
expose:
# zookeeper
- "2181"

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=1.8.0
PINPOINT_VERSION=1.8.2
### Pinpoint-mysql
MYSQL_ROOT_PASSWORD=root123

View File

@ -1,6 +1,6 @@
FROM mysql:5.7
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.2}
RUN apt update \
&& apt-get install -y --no-install-recommends ca-certificates wget \

View File

@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
## Supported Tags
- 1.8.2
- 1.8.1
- 1.8.0
- 1.7.3
- 1.7.2

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=1.8.0
PINPOINT_VERSION=1.8.2
### Pinpoint-Agent

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=1.8.0
PINPOINT_VERSION=1.8.2
### Pinpoint-Web

View File

@ -2,7 +2,7 @@ FROM tomcat:8-jre8
LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.0}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.2}
ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war
COPY /build/scripts/start-web.sh /usr/local/bin/

View File

@ -5,6 +5,8 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
## Supported Tags
- 1.8.2
- 1.8.1
- 1.8.0
- 1.7.3
- 1.7.2