MyoaEngineering
/
pinpoint-docker-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release 2.4.0

This commit is contained in:
ga-ram 2022-05-30 19:41:05 +09:00
parent 0da267c489
commit 8eface18ad
27 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.3.3 PINPOINT_VERSION=2.4.0
SPRING_PROFILES=release SPRING_PROFILES=release
#zookeeper information required #zookeeper information required
PINPOINT_ZOOKEEPER_ADDRESS=zoo1 PINPOINT_ZOOKEEPER_ADDRESS=zoo1

8
docker-compose.yml
View File

@ -170,8 +170,14 @@ services:
- pinpoint-agent - pinpoint-agent
pinpoint-batch: pinpoint-batch:
build:
context: ./pinpoint-batch/
dockerfile: Dockerfile
args:
- PINPOINT_VERSION=${PINPOINT_VERSION}
container_name: "${PINPOINT_BATCH_NAME}" container_name: "${PINPOINT_BATCH_NAME}"
image: "pinpointdocker/pinpoint-batch:${IMAGE_VERSION}" image: "pinpointdocker/pinpoint-batch:${PINPOINT_VERSION}"
depends_on: depends_on:
- pinpoint-hbase - pinpoint-hbase
- pinpoint-mysql - pinpoint-mysql

2
pinpoint-agent-attach-example/java/.env
View File

@ -1,5 +1,5 @@
### Pinpoint with Java ### Pinpoint with Java
PINPOINT_VERSION=2.3.3 PINPOINT_VERSION=2.4.0
SPRING_PROFILES=release SPRING_PROFILES=release
AGENT_ID=app-in-docker AGENT_ID=app-in-docker
APP_NAME=quickapp APP_NAME=quickapp

2
pinpoint-agent-attach-example/tomcat/.env
View File

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

2
pinpoint-agent/Dockerfile
View File

@ -1,6 +1,6 @@
FROM alpine:3.7 FROM alpine:3.7
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz 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/ COPY /build/scripts/configure-agent.sh /usr/local/bin/

1
pinpoint-agent/Readme.md
View File

@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
## Supported Tags ## Supported Tags
- 2.4.0
- 2.3.3 - 2.3.3
- 2.3.2 - 2.3.2
- 2.3.1 - 2.3.1

2
pinpoint-batch/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.3.3 PINPOINT_VERSION=2.4.0
SPRING_PROFILES=release SPRING_PROFILES=release
### Pinpoint-Batch ### Pinpoint-Batch

2
pinpoint-batch/Dockerfile
View File

@ -1,6 +1,6 @@
FROM openjdk:8-jdk-alpine FROM openjdk:8-jdk-alpine
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar
RUN mkdir -p /pinpoint/config \ RUN mkdir -p /pinpoint/config \

8
pinpoint-batch/build/config/pinpoint-batch.properties Normal file
View File

@ -0,0 +1,8 @@
##########
# another way of setting properties.
# applied priority '.ENV' -> 'pinpoint-web.properties'
# property should be commented in docker-compose file to use
# ex) PINPOINT_ZOOKEEPER_ADDRESS should be commented in docker-compose to use pinpoint.zookeeper.address below
##########
pinpoint.zookeeper.address=

5
pinpoint-batch/build/scripts/start-batch.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
set -e
set -x
exec java -jar /pinpoint/pinpoint-batch.jar --spring.config.additional-location=/pinpoint/config/pinpoint-batch.properties

2
pinpoint-collector/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.3.3 PINPOINT_VERSION=2.4.0
SPRING_PROFILES=release SPRING_PROFILES=release
### Pinpoint-Collector ### Pinpoint-Collector

4
pinpoint-collector/Dockerfile
View File

@ -1,6 +1,6 @@
FROM openjdk:8-jdk-alpine FROM openjdk:8-jdk-alpine
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar 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 \ RUN mkdir -p /pinpoint/config \
@ -9,7 +9,7 @@ RUN mkdir -p /pinpoint/config \
COPY /build/config/pinpoint-collector.properties /pinpoint/config/ COPY /build/config/pinpoint-collector.properties /pinpoint/config/
COPY /build/scripts/start-collector.sh /pinpoint/scripts/ COPY /build/scripts/start-collector.sh /pinpoint/scripts/
#temporary line for local test #temporary line for local test
#COPY /pinpoint-collector-boot-2.3.3-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar #COPY /pinpoint-collector-boot-2.4.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
RUN apk --no-cache add curl \ RUN apk --no-cache add curl \
&& chmod a+x /pinpoint/scripts/start-collector.sh \ && chmod a+x /pinpoint/scripts/start-collector.sh \

1
pinpoint-collector/Readme.md
View File

@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl
## Supported Tags ## Supported Tags
- 2.4.0
- 2.3.3 - 2.3.3
- 2.3.2 - 2.3.2
- 2.3.1 - 2.3.1

2
pinpoint-flink/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.3.3 PINPOINT_VERSION=2.4.0
### Pinpoint-flink ### Pinpoint-flink

4
pinpoint-flink/Dockerfile
View File

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

1
pinpoint-flink/Readme.md
View File

@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Flink component of the Pinpoint applicat
## Supported Tags ## Supported Tags
- 2.4.0
- 2.3.3 - 2.3.3
- 2.3.2 - 2.3.2
- 2.3.1 - 2.3.1

2
pinpoint-hbase/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.3.3 PINPOINT_VERSION=2.4.0
### Pinpoint-Hbase ### Pinpoint-Hbase

2
pinpoint-hbase/Dockerfile
View File

@ -1,6 +1,6 @@
FROM java:8-jdk FROM java:8-jdk
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase

1
pinpoint-hbase/Readme.md
View File

@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
## Supported Tags ## Supported Tags
- 2.4.0
- 2.3.3 - 2.3.3
- 2.3.2 - 2.3.2
- 2.3.1 - 2.3.1

2
pinpoint-mysql/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.3.3 PINPOINT_VERSION=2.4.0
### Pinpoint-mysql ### Pinpoint-mysql
MYSQL_ROOT_PASSWORD=root123 MYSQL_ROOT_PASSWORD=root123

2
pinpoint-mysql/Dockerfile
View File

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

1
pinpoint-mysql/Readme.md
View File

@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
## Supported Tags ## Supported Tags
- 2.4.0
- 2.3.3 - 2.3.3
- 2.3.2 - 2.3.2
- 2.3.1 - 2.3.1

2
pinpoint-quickstart/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.3.3 PINPOINT_VERSION=2.4.0
SPRING_PROFILES=release SPRING_PROFILES=release
### Pinpoint-Agent ### Pinpoint-Agent

1
pinpoint-quickstart/Readme.md
View File

@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Quickstart sample to test Pinpoint appli
## Supported Tags ## Supported Tags
- 2.4.0
- 2.3.3 - 2.3.3
- 2.3.2 - 2.3.2
- 2.3.1 - 2.3.1

2
pinpoint-web/.env
View File

@ -1,4 +1,4 @@
PINPOINT_VERSION=2.3.3 PINPOINT_VERSION=2.4.0
SPRING_PROFILES=release SPRING_PROFILES=release
### Pinpoint-Web ### Pinpoint-Web

4
pinpoint-web/Dockerfile
View File

@ -1,6 +1,6 @@
FROM openjdk:8-jdk-alpine FROM openjdk:8-jdk-alpine
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar 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 \ RUN mkdir -p /pinpoint/config \
@ -9,7 +9,7 @@ RUN mkdir -p /pinpoint/config \
COPY /build/config/pinpoint-web.properties /pinpoint/config/ COPY /build/config/pinpoint-web.properties /pinpoint/config/
COPY /build/scripts/start-web.sh /pinpoint/scripts/ COPY /build/scripts/start-web.sh /pinpoint/scripts/
#temporary line for local test #temporary line for local test
#COPY /pinpoint-web-boot-2.3.3-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar #COPY /pinpoint-web-boot-2.4.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
RUN apk --no-cache add curl \ RUN apk --no-cache add curl \
&& chmod a+x /pinpoint/scripts/start-web.sh \ && chmod a+x /pinpoint/scripts/start-web.sh \

1
pinpoint-web/Readme.md
View File

@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
## Supported Tags ## Supported Tags
- 2.4.0
- 2.3.3 - 2.3.3
- 2.3.2 - 2.3.2
- 2.3.1 - 2.3.1