Skip to content

Commit 6410e28

Browse files
ga-ramga-ram
committed
Release 2.5.0 and add metric cluster for mac m1
1 parent 62fd870 commit 6410e28

File tree

33 files changed

+304
-36
lines changed

33 files changed

+304
-36
lines changed

‎.env

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
PINPOINT_VERSION=2.4.2
1+
PINPOINT_VERSION=2.5.0
22
SPRING_PROFILES=release
33

44
# Used to make collector ip fixed for external microservices which uses pinpoint agent with collector ip.
5-
PINPOINT_NETWORK_SUBNET=172.24.0.0/28
6-
COLLECTOR_FIXED_IP=172.24.0.11
5+
PINPOINT_NETWORK_SUBNET=172.24.0.0/27
6+
COLLECTOR_FIXED_IP=172.24.0.30
77

88
#zookeeper information required
99
PINPOINT_ZOOKEEPER_ADDRESS=zoo1
@@ -155,3 +155,11 @@ FLINK_WEB_PORT=8081
155155
### Pinpoint-quickstart
156156

157157
APP_PORT=8085
158+
159+
### Pinpoint-pinot
160+
PINPOINT_PINOT_JDBC_URL=jdbc:pinot://pinot-controller:9000
161+
PINPOINT_PINOT_JDBC_USERNAME=admin
162+
PINPOINT_PINOT_JDBC_PASSWORD=admin
163+
164+
### Pinpoint-kafka
165+
PINPOINT_METRIC_KAFKA_BOOTSTRAP_SERVERS=pinpoint-kafka:9092

‎Readme.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Installing Pinpoint with these docker files will take approximately 10min. to ch
1212
It supports and helps you understand your application in a glance and allow you to build world-class, high-quality software.
1313

1414
## Supported Tags
15+
- 2.5.0
1516
- 2.4.2
1617
- 2.4.1
1718
- 2.4.0

‎docker-compose-metric.yml

+214
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
1+
version: "3.6"
2+
3+
services:
4+
pinpoint-web:
5+
build:
6+
context: ./pinpoint-web
7+
dockerfile: Dockerfile-metric
8+
args:
9+
- PINPOINT_VERSION=${PINPOINT_VERSION}
10+
container_name: "${PINPOINT_WEB_NAME}"
11+
image: "pinpointdocker/pinpoint-web:${PINPOINT_VERSION}-metric"
12+
depends_on:
13+
- pinpoint-hbase
14+
- pinpoint-mysql
15+
- zoo1
16+
- pinpoint-kafka-init
17+
- pinot-init
18+
restart: always
19+
expose:
20+
- "9997"
21+
ports:
22+
- "9997:9997"
23+
- "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
24+
environment:
25+
- WEB_SERVER_PORT=${WEB_SERVER_PORT}
26+
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},metric
27+
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
28+
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
29+
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
30+
- CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
31+
- LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
32+
- CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
33+
- JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
34+
- JDBC_URL=${JDBC_URL}
35+
- JDBC_USERNAME=${JDBC_USERNAME}
36+
- JDBC_PASSWORD=${JDBC_PASSWORD}
37+
- PINPOINT_PINOT_JDBC_URL=${PINPOINT_PINOT_JDBC_URL}
38+
- PINPOINT_PINOT_JDBC_USERNAME=${PINPOINT_PINOT_JDBC_USERNAME}
39+
- PINPOINT_PINOT_JDBC_PASSWORD=${PINPOINT_PINOT_JDBC_PASSWORD}
40+
links:
41+
- "pinpoint-mysql:pinpoint-mysql"
42+
networks:
43+
- pinpoint
44+
45+
46+
pinpoint-collector:
47+
build:
48+
context: ./pinpoint-collector
49+
dockerfile: Dockerfile-metric
50+
args:
51+
- PINPOINT_VERSION=${PINPOINT_VERSION}
52+
container_name: "${PINPOINT_COLLECTOR_NAME}"
53+
image: "pinpointdocker/pinpoint-collector:${PINPOINT_VERSION}-metric"
54+
depends_on:
55+
- pinpoint-hbase
56+
- zoo1
57+
- pinpoint-kafka-init
58+
- pinot-init
59+
restart: always
60+
expose:
61+
- "9991"
62+
- "9992"
63+
- "9993"
64+
- "9994"
65+
- "9995"
66+
- "9996"
67+
- "15200"
68+
ports:
69+
- "${COLLECTOR_RECEIVER_GRPC_AGENT_PORT:-9991}:9991/tcp"
70+
- "${COLLECTOR_RECEIVER_GRPC_STAT_PORT:-9992}:9992/tcp"
71+
- "${COLLECTOR_RECEIVER_GRPC_SPAN_PORT:-9993}:9993/tcp"
72+
- "${COLLECTOR_RECEIVER_BASE_PORT:-9994}:9994"
73+
- "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/tcp"
74+
- "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/tcp"
75+
- "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/udp"
76+
- "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/udp"
77+
networks:
78+
pinpoint:
79+
ipv4_address: ${COLLECTOR_FIXED_IP}
80+
environment:
81+
- SPRING_PROFILES_ACTIVE=local,metric
82+
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
83+
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
84+
- LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
85+
- FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
86+
- FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
87+
- PINPOINT_PINOT_JDBC_URL=${PINPOINT_PINOT_JDBC_URL}
88+
- PINPOINT_PINOT_JDBC_USERNAME=${PINPOINT_PINOT_JDBC_USERNAME}
89+
- PINPOINT_PINOT_JDBC_PASSWORD=${PINPOINT_PINOT_JDBC_PASSWORD}
90+
- PINPOINT_METRIC_KAFKA_BOOTSTRAP_SERVERS=${PINPOINT_METRIC_KAFKA_BOOTSTRAP_SERVERS}
91+
92+
pinpoint-kafka:
93+
image: ubuntu/kafka:3.1-22.04_beta
94+
restart: unless-stopped
95+
hostname: pinpoint-kafka
96+
command: /etc/kafka/server.properties --override advertised.listeners=PLAINTEXT://pinpoint-kafka:9092
97+
depends_on:
98+
- pinot-zoo
99+
expose:
100+
- "9092"
101+
environment:
102+
- ZOOKEEPER_HOST=pinot-zoo
103+
networks:
104+
- pinpoint
105+
106+
pinpoint-kafka-init:
107+
image: ubuntu/kafka:3.1-22.04_beta
108+
restart: "no"
109+
depends_on:
110+
- pinpoint-kafka
111+
entrypoint: >
112+
sh -c "/opt/kafka/bin/kafka-topics.sh --create --topic url-stat --bootstrap-server pinpoint-kafka:9092 &&
113+
/opt/kafka/bin/kafka-topics.sh --create --topic system-metric-data-type --bootstrap-server pinpoint-kafka:9092 &&
114+
/opt/kafka/bin/kafka-topics.sh --create --topic system-metric-tag --bootstrap-server pinpoint-kafka:9092 &&
115+
/opt/kafka/bin/kafka-topics.sh --create --topic system-metric-double --bootstrap-server pinpoint-kafka:9092"
116+
networks:
117+
- pinpoint
118+
119+
pinot-controller:
120+
image: apachepinot/pinot:latest-arm64
121+
restart: unless-stopped
122+
command: StartController -zkAddress pinot-zoo
123+
depends_on:
124+
- pinot-zoo
125+
expose:
126+
- "9000"
127+
ports:
128+
- "9000:9000"
129+
networks:
130+
- pinpoint
131+
132+
pinot-broker-0:
133+
image: apachepinot/pinot:latest-arm64
134+
restart: unless-stopped
135+
command: StartBroker -zkAddress pinot-zoo
136+
depends_on:
137+
- pinot-controller
138+
expose:
139+
- "8099"
140+
networks:
141+
- pinpoint
142+
143+
pinot-server-0:
144+
image: apachepinot/pinot:latest-arm64
145+
restart: unless-stopped
146+
command: StartServer -zkAddress pinot-zoo
147+
depends_on:
148+
- pinot-broker-0
149+
expose:
150+
- "8098"
151+
networks:
152+
- pinpoint
153+
154+
pinot-init:
155+
image: apachepinot/pinot:latest-arm64
156+
restart: "no"
157+
entrypoint: >
158+
sh -c "
159+
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-uriStat-table.json > uriStatTable.json &&
160+
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-uriStat-schema.json > uriStatSchema.json &&
161+
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-tag-table.json > tagTable.json &&
162+
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-tag-schema.json > tagSchema.json &&
163+
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-double-table.json > doubleTable.json &&
164+
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-double-schema.json > doubleSchema.json &&
165+
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-dataType-table.json > dataTypeTable.json &&
166+
curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-dataType-schema.json > dataTypeSchema.json &&
167+
168+
sed -i 's/localhost:19092/pinpoint-kafka:9092/g' uriStatTable.json tagTable.json doubleTable.json dataTypeTable.json &&
169+
sed -i 's/uri-stat/url-stat/g' uriStatTable.json &&
170+
sed -i '3,$$s/Double/DOUBLE/' doubleSchema.json &&
171+
172+
sleep 30 &&
173+
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile uriStatSchema.json -realtimeTableConfigFile uriStatTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
174+
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile tagSchema.json -realtimeTableConfigFile tagTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
175+
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile doubleSchema.json -realtimeTableConfigFile doubleTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
176+
/opt/pinot/bin/pinot-admin.sh AddTable -schemaFile dataTypeSchema.json -realtimeTableConfigFile dataTypeTable.json -controllerHost pinot-controller -controllerPort 9000 -exec"
177+
depends_on:
178+
- pinot-server
179+
- pinpoint-kafka-init
180+
networks:
181+
- pinpoint
182+
183+
#zookeepers
184+
pinot-zoo:
185+
image: zookeeper:3.8.0-temurin
186+
restart: always
187+
expose:
188+
- "2181"
189+
networks:
190+
- pinpoint
191+
192+
telegraf:
193+
image: telegraf:1.25.0
194+
networks:
195+
- pinpoint
196+
depends_on:
197+
- pinpoint-collector
198+
entrypoint: >
199+
sh -c "
200+
echo '
201+
[[inputs.cpu]]\
202+
percpu = true\
203+
totalcpu = true\
204+
collect_cpu_time = false\
205+
report_active = false\
206+
207+
[[outputs.http]]\
208+
url = \"http://pinpoint-collector:15200/telegraf\"\
209+
data_format = \"json\"\
210+
[outputs.http.headers]\
211+
hostGroupName = \"pinpoint-docker\"\
212+
Content-Type = \"application/json\"\' > telegraf.conf &&
213+
cat telegraf.conf &&
214+
telegraf -config telegraf.conf"

‎docker-compose.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ services:
9595
- "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
9696
environment:
9797
- WEB_SERVER_PORT=${WEB_SERVER_PORT}
98-
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
98+
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
9999
- PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
100100
- CLUSTER_ENABLE=${CLUSTER_ENABLE}
101101
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
@@ -223,9 +223,7 @@ services:
223223

224224
container_name: "${PINPOINT_AGENT_NAME}"
225225
image: "pinpointdocker/pinpoint-agent:${PINPOINT_VERSION}"
226-
227226
restart: unless-stopped
228-
229227
networks:
230228
- pinpoint
231229
volumes:

‎pinpoint-agent-attach-example/java/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### Pinpoint with Java
2-
PINPOINT_VERSION=2.4.2
2+
PINPOINT_VERSION=2.5.0
33
SPRING_PROFILES=release
44
AGENT_ID=java-app-in-docker
55
APP_NAME=JavaAttachExample

‎pinpoint-agent-attach-example/tomcat/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### Pinpoint with Tomcat
2-
PINPOINT_VERSION=2.4.2
2+
PINPOINT_VERSION=2.5.0
33
SPRING_PROFILES=release
44
APP_PORT=8085
55
AGENT_ID=app-in-docker

‎pinpoint-agent/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PINPOINT_VERSION=2.4.2
1+
PINPOINT_VERSION=2.5.0
22
SPRING_PROFILES=release
33

44
### Pinpoint-Agent

‎pinpoint-agent/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:3.7
22

3-
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2}
3+
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
44
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
55

66
COPY /build/scripts/configure-agent.sh /usr/local/bin/

‎pinpoint-agent/Readme.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
This Docker image contains the Pinpoint Agent component of the Pinpoint application monitoring system.
55

66
## Supported Tags
7+
- 2.5.0
78
- 2.4.2
89
- 2.4.1
910
- 2.4.0

‎pinpoint-agent/build/scripts/configure-agent.sh

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ set -e
33
set -x
44

55
#sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/pinpoint.config
6-
sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
6+
sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
77

8-
sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
8+
sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
99
sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint-root.config
1010
sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint-root.config
1111
sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint-root.config
1212

1313
#sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
14-
sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
14+
sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
1515
sed -i "/profiler.transport.grpc.agent.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
1616
sed -i "/profiler.transport.grpc.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
1717
sed -i "/profiler.transport.grpc.stat.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
1818
sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
19-
sed -i "/profiler.sampling.type=/ s/=.*/=${PROFILER_SAMPLING_TYPE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
20-
sed -i "/profiler.sampling.counting.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
21-
sed -i "/profiler.sampling.percent.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
22-
sed -i "/profiler.sampling.new.throughput=/ s/=.*/=${PROFILER_SAMPLING_NEW_THROUGHPUT}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
23-
sed -i "/profiler.sampling.continue.throughput=/ s/=.*/=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
19+
sed -i "/profiler.sampling.type=/ s/=.*/=${PROFILER_SAMPLING_TYPE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
20+
sed -i "/profiler.sampling.counting.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
21+
sed -i "/profiler.sampling.percent.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
22+
sed -i "/profiler.sampling.new.throughput=/ s/=.*/=${PROFILER_SAMPLING_NEW_THROUGHPUT}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
23+
sed -i "/profiler.sampling.continue.throughput=/ s/=.*/=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
2424

25-
sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\">/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j2.xml
25+
sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\">/g" /pinpoint-agent/profiles/local/log4j2.xml /pinpoint-agent/profiles/release/log4j2.xml
2626

2727
exec "$@"

‎pinpoint-batch/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PINPOINT_VERSION=2.4.2
1+
PINPOINT_VERSION=2.5.0
22
SPRING_PROFILES=release
33

44
### Pinpoint-Batch

‎pinpoint-batch/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM openjdk:11.0.16-jre-slim-buster
22

3-
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2}
3+
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
44
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar
55

66
RUN mkdir -p /pinpoint/config \

‎pinpoint-batch/Readme.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
This Docker image contains the Pinpoint Batch component of the Pinpoint application monitoring system.
44

55
## Supported Tags
6+
- 2.5.0
67
- 2.4.2
78
- 2.4.1
89
- 2.4.0

‎pinpoint-collector/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PINPOINT_VERSION=2.4.2
1+
PINPOINT_VERSION=2.5.0
22
SPRING_PROFILES=release
33

44
### Pinpoint-Collector

‎pinpoint-collector/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
FROM openjdk:11.0.16-jre-slim-buster
22

3-
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2}
3+
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
44
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
55

66
RUN mkdir -p /pinpoint/config \
77
&& mkdir -p /pinpoint/scripts
88

99
COPY /build/config/pinpoint-collector.properties /pinpoint/config/
1010
COPY /build/scripts/start-collector.sh /pinpoint/scripts/
11-
#temporary line for local test
12-
#COPY /pinpoint-collector-boot-2.4.2-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
1311

1412
RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
1513
&& chmod a+x /pinpoint/scripts/start-collector.sh \

0 commit comments

Comments
 (0)