Compare commits

..

No commits in common. "master" and "2.5.2" have entirely different histories.

30 changed files with 20 additions and 92 deletions

2
.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
SPRING_PROFILES=release
# Used to make collector ip fixed for external microservices which uses pinpoint agent with collector ip.

View File

@ -12,8 +12,6 @@ Installing Pinpoint with these docker files will take approximately 10min. to ch
It supports and helps you understand your application in a glance and allow you to build world-class, high-quality software.
## Supported Tags
- 2.5.3-metric (for web and collector)
- 2.5.3
- 2.5.2-metric (for web and collector)
- 2.5.2
- 2.5.1-metric (for web and collector)

View File

@ -48,11 +48,6 @@ services:
restart: always
depends_on:
- zoo1
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
pinpoint-mysql:
build:
@ -77,11 +72,6 @@ services:
- mysql_data:/var/lib/mysql
networks:
- pinpoint
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
pinpoint-web:
build:
@ -120,11 +110,6 @@ services:
- "pinpoint-mysql:pinpoint-mysql"
networks:
- pinpoint
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
pinpoint-collector:
build:
@ -166,11 +151,6 @@ services:
- LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
- FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
- FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
pinpoint-quickstart:
build:
@ -189,11 +169,6 @@ services:
- pinpoint
depends_on:
- pinpoint-agent
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
pinpoint-batch:
build:
@ -238,11 +213,6 @@ services:
- "pinpoint-mysql:pinpoint-mysql"
networks:
- pinpoint
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
pinpoint-agent:
build:
@ -274,11 +244,6 @@ services:
- PROFILER_TRANSPORT_MODULE=${PROFILER_TRANSPORT_MODULE}
depends_on:
- pinpoint-collector
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
#zookeepers
zoo1:
@ -296,11 +261,6 @@ services:
ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
networks:
- pinpoint
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
zoo2:
image: zookeeper:3.4.13
@ -317,11 +277,6 @@ services:
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zoo3:2888:3888
networks:
- pinpoint
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
zoo3:
image: zookeeper:3.4.13
@ -338,11 +293,6 @@ services:
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=0.0.0.0:2888:3888
networks:
- pinpoint
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
##flink
jobmanager:
@ -366,11 +316,6 @@ services:
- pinpoint
depends_on:
- zoo1
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
taskmanager:
build:
@ -399,11 +344,6 @@ services:
- JOB_MANAGER_RPC_ADDRESS=jobmanager
networks:
- pinpoint
logging:
driver: "json-file"
options:
max-file: "3"
max-size: "10m"
volumes:
data-volume:

View File

@ -1,5 +1,5 @@
### Pinpoint with Java
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
SPRING_PROFILES=release
AGENT_ID=java-app-in-docker
APP_NAME=JavaAttachExample

View File

@ -1,5 +1,5 @@
### Pinpoint with Tomcat
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
SPRING_PROFILES=release
APP_PORT=8085
AGENT_ID=app-in-docker

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
SPRING_PROFILES=release
### Pinpoint-Agent

View File

@ -1,6 +1,6 @@
FROM alpine:3.7
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.2}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
COPY /build/scripts/configure-agent.sh /usr/local/bin/

View File

@ -4,7 +4,6 @@
This Docker image contains the Pinpoint Agent component of the Pinpoint application monitoring system.
## Supported Tags
- 2.5.3
- 2.5.2
- 2.5.1
- 2.5.0

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
SPRING_PROFILES=release
### Pinpoint-Batch

View File

@ -1,6 +1,6 @@
FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.2}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar
RUN mkdir -p /pinpoint/config \

View File

@ -3,7 +3,6 @@
This Docker image contains the Pinpoint Batch component of the Pinpoint application monitoring system.
## Supported Tags
- 2.5.3
- 2.5.2
- 2.5.1
- 2.5.0

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
SPRING_PROFILES=release
### Pinpoint-Collector

View File

@ -1,6 +1,6 @@
FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.2}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
RUN mkdir -p /pinpoint/config \

View File

@ -1,6 +1,6 @@
FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.2}
#ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-${PINPOINT_VERSION}.jar
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-${PINPOINT_VERSION}.jar

View File

@ -4,8 +4,6 @@
This Docker image contains the Pinpoint Collector component of the Pinpoint application monitoring system.
## Supported Tags
- 2.5.3-metric
- 2.5.3
- 2.5.2
- 2.5.2-metric
- 2.5.1

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
### Pinpoint-flink

View File

@ -1,5 +1,5 @@
FROM flink:1.14-java11
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.2}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-flink-job-${PINPOINT_VERSION}.jar
RUN apt-get update \

View File

@ -4,7 +4,6 @@
This Docker image contains the Pinpoint Flink component of the Pinpoint application monitoring system.
## Supported Tags
- 2.5.3
- 2.5.2
- 2.5.1
- 2.5.0

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
HBASE_VERSION=1.2.6
### Pinpoint-Hbase

View File

@ -1,6 +1,6 @@
FROM openjdk:8u342-slim
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.2}
ARG HBASE_VERSION=${HBASE_VERSION:-1.2.6}
ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase

View File

@ -4,7 +4,6 @@
This Docker image contains the Pinpoint Hbase component of the Pinpoint application monitoring system.
## Supported Tags
- 2.5.3
- 2.5.2
- 2.5.1
- 2.5.0

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
### Pinpoint-mysql
MYSQL_ROOT_PASSWORD=root123

View File

@ -1,6 +1,6 @@
FROM mysql:8.0
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.2}
RUN curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" -o /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \
&& curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" -o /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \

View File

@ -4,7 +4,6 @@
This Docker image contains the Pinpoint Mysql component of the Pinpoint application monitoring system.
## Supported Tags
- 2.5.3
- 2.5.2
- 2.5.1
- 2.5.0

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
SPRING_PROFILES=release
### Pinpoint-Agent

View File

@ -4,7 +4,6 @@
This Docker image contains the Pinpoint Quickstart sample to test Pinpoint application monitoring system.
## Supported Tags
- 2.5.3
- 2.5.2
- 2.5.1
- 2.5.0

View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.5.3
PINPOINT_VERSION=2.5.2
SPRING_PROFILES=release
### Pinpoint-Web

View File

@ -1,6 +1,6 @@
FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.2}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar
RUN mkdir -p /pinpoint/config \

View File

@ -1,6 +1,6 @@
FROM openjdk:11.0.16-jre-slim-buster
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.3}
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.2}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-starter-boot-${PINPOINT_VERSION}.jar
RUN mkdir -p /pinpoint/config \

View File

@ -4,8 +4,6 @@
This Docker image contains the Pinpoint Web component of the Pinpoint application monitoring system.
## Supported Tags
- 2.5.3-metric
- 2.5.3
- 2.5.2
- 2.5.2-metric
- 2.5.1