From 8eface18ad6dcd8e7d6427f0c0cfb04f06ffd913 Mon Sep 17 00:00:00 2001 From: ga-ram Date: Mon, 30 May 2022 19:41:05 +0900 Subject: [PATCH] Release 2.4.0 --- .env | 2 +- docker-compose.yml | 8 +++++++- pinpoint-agent-attach-example/java/.env | 2 +- pinpoint-agent-attach-example/tomcat/.env | 2 +- pinpoint-agent/Dockerfile | 2 +- pinpoint-agent/Readme.md | 1 + pinpoint-batch/.env | 2 +- pinpoint-batch/Dockerfile | 2 +- pinpoint-batch/build/config/pinpoint-batch.properties | 8 ++++++++ pinpoint-batch/build/scripts/start-batch.sh | 5 +++++ pinpoint-collector/.env | 2 +- pinpoint-collector/Dockerfile | 4 ++-- pinpoint-collector/Readme.md | 1 + pinpoint-flink/.env | 2 +- pinpoint-flink/Dockerfile | 4 ++-- pinpoint-flink/Readme.md | 1 + pinpoint-hbase/.env | 2 +- pinpoint-hbase/Dockerfile | 2 +- pinpoint-hbase/Readme.md | 1 + pinpoint-mysql/.env | 2 +- pinpoint-mysql/Dockerfile | 2 +- pinpoint-mysql/Readme.md | 1 + pinpoint-quickstart/.env | 2 +- pinpoint-quickstart/Readme.md | 1 + pinpoint-web/.env | 2 +- pinpoint-web/Dockerfile | 4 ++-- pinpoint-web/Readme.md | 1 + 27 files changed, 47 insertions(+), 21 deletions(-) create mode 100644 pinpoint-batch/build/config/pinpoint-batch.properties create mode 100644 pinpoint-batch/build/scripts/start-batch.sh diff --git a/.env b/.env index 18dd5f3..88771d6 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.3 +PINPOINT_VERSION=2.4.0 SPRING_PROFILES=release #zookeeper information required PINPOINT_ZOOKEEPER_ADDRESS=zoo1 diff --git a/docker-compose.yml b/docker-compose.yml index 6a4484e..ca73946 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -170,8 +170,14 @@ services: - pinpoint-agent pinpoint-batch: + build: + context: ./pinpoint-batch/ + dockerfile: Dockerfile + args: + - PINPOINT_VERSION=${PINPOINT_VERSION} + container_name: "${PINPOINT_BATCH_NAME}" - image: "pinpointdocker/pinpoint-batch:${IMAGE_VERSION}" + image: "pinpointdocker/pinpoint-batch:${PINPOINT_VERSION}" depends_on: - pinpoint-hbase - pinpoint-mysql diff --git a/pinpoint-agent-attach-example/java/.env b/pinpoint-agent-attach-example/java/.env index 29c65c2..2841815 100644 --- a/pinpoint-agent-attach-example/java/.env +++ b/pinpoint-agent-attach-example/java/.env @@ -1,5 +1,5 @@ ### Pinpoint with Java -PINPOINT_VERSION=2.3.3 +PINPOINT_VERSION=2.4.0 SPRING_PROFILES=release AGENT_ID=app-in-docker APP_NAME=quickapp \ No newline at end of file diff --git a/pinpoint-agent-attach-example/tomcat/.env b/pinpoint-agent-attach-example/tomcat/.env index 0db4640..ac90812 100644 --- a/pinpoint-agent-attach-example/tomcat/.env +++ b/pinpoint-agent-attach-example/tomcat/.env @@ -1,5 +1,5 @@ ### Pinpoint with Tomcat -PINPOINT_VERSION=2.3.3 +PINPOINT_VERSION=2.4.0 SPRING_PROFILES=release APP_PORT=8085 AGENT_ID=app-in-docker diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index 53ad7ec..79e8b5b 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -1,6 +1,6 @@ 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 COPY /build/scripts/configure-agent.sh /usr/local/bin/ diff --git a/pinpoint-agent/Readme.md b/pinpoint-agent/Readme.md index 20ba847..2e14fde 100644 --- a/pinpoint-agent/Readme.md +++ b/pinpoint-agent/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat ## Supported Tags + - 2.4.0 - 2.3.3 - 2.3.2 - 2.3.1 diff --git a/pinpoint-batch/.env b/pinpoint-batch/.env index 183791e..b297eb3 100644 --- a/pinpoint-batch/.env +++ b/pinpoint-batch/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.3 +PINPOINT_VERSION=2.4.0 SPRING_PROFILES=release ### Pinpoint-Batch diff --git a/pinpoint-batch/Dockerfile b/pinpoint-batch/Dockerfile index c9bb55f..32c1180 100644 --- a/pinpoint-batch/Dockerfile +++ b/pinpoint-batch/Dockerfile @@ -1,6 +1,6 @@ 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 RUN mkdir -p /pinpoint/config \ diff --git a/pinpoint-batch/build/config/pinpoint-batch.properties b/pinpoint-batch/build/config/pinpoint-batch.properties new file mode 100644 index 0000000..7bcd631 --- /dev/null +++ b/pinpoint-batch/build/config/pinpoint-batch.properties @@ -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= \ No newline at end of file diff --git a/pinpoint-batch/build/scripts/start-batch.sh b/pinpoint-batch/build/scripts/start-batch.sh new file mode 100644 index 0000000..10e9ca8 --- /dev/null +++ b/pinpoint-batch/build/scripts/start-batch.sh @@ -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 \ No newline at end of file diff --git a/pinpoint-collector/.env b/pinpoint-collector/.env index 09864e8..7c23a22 100644 --- a/pinpoint-collector/.env +++ b/pinpoint-collector/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.3 +PINPOINT_VERSION=2.4.0 SPRING_PROFILES=release ### Pinpoint-Collector diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index 389b14b..da95281 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -1,6 +1,6 @@ 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 RUN mkdir -p /pinpoint/config \ @@ -9,7 +9,7 @@ RUN mkdir -p /pinpoint/config \ COPY /build/config/pinpoint-collector.properties /pinpoint/config/ COPY /build/scripts/start-collector.sh /pinpoint/scripts/ #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 \ && chmod a+x /pinpoint/scripts/start-collector.sh \ diff --git a/pinpoint-collector/Readme.md b/pinpoint-collector/Readme.md index 56be6ea..75d952b 100644 --- a/pinpoint-collector/Readme.md +++ b/pinpoint-collector/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl ## Supported Tags + - 2.4.0 - 2.3.3 - 2.3.2 - 2.3.1 diff --git a/pinpoint-flink/.env b/pinpoint-flink/.env index 2184d91..e581ff4 100644 --- a/pinpoint-flink/.env +++ b/pinpoint-flink/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.3 +PINPOINT_VERSION=2.4.0 ### Pinpoint-flink diff --git a/pinpoint-flink/Dockerfile b/pinpoint-flink/Dockerfile index f70e530..c08c6f2 100644 --- a/pinpoint-flink/Dockerfile +++ b/pinpoint-flink/Dockerfile @@ -1,5 +1,5 @@ -FROM flink:1.7 -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3} +FROM flink:1.14.2 +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 RUN apt-get update \ diff --git a/pinpoint-flink/Readme.md b/pinpoint-flink/Readme.md index 848e013..f7d0bec 100644 --- a/pinpoint-flink/Readme.md +++ b/pinpoint-flink/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Flink component of the Pinpoint applicat ## Supported Tags + - 2.4.0 - 2.3.3 - 2.3.2 - 2.3.1 diff --git a/pinpoint-hbase/.env b/pinpoint-hbase/.env index d8b08b3..c61d3dd 100644 --- a/pinpoint-hbase/.env +++ b/pinpoint-hbase/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.3 +PINPOINT_VERSION=2.4.0 ### Pinpoint-Hbase diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile index 465f52f..fdf0233 100644 --- a/pinpoint-hbase/Dockerfile +++ b/pinpoint-hbase/Dockerfile @@ -1,6 +1,6 @@ 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_SUB_REPOSITORY=http://archive.apache.org/dist/hbase diff --git a/pinpoint-hbase/Readme.md b/pinpoint-hbase/Readme.md index f6d0306..1e87704 100644 --- a/pinpoint-hbase/Readme.md +++ b/pinpoint-hbase/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat ## Supported Tags + - 2.4.0 - 2.3.3 - 2.3.2 - 2.3.1 diff --git a/pinpoint-mysql/.env b/pinpoint-mysql/.env index c84ccaf..7a89046 100644 --- a/pinpoint-mysql/.env +++ b/pinpoint-mysql/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.3 +PINPOINT_VERSION=2.4.0 ### Pinpoint-mysql MYSQL_ROOT_PASSWORD=root123 diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index ab7b485..c07a520 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -1,6 +1,6 @@ FROM mysql:5.7 -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.3} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0} RUN apt update \ && apt-get install -y --no-install-recommends ca-certificates wget \ diff --git a/pinpoint-mysql/Readme.md b/pinpoint-mysql/Readme.md index f7ab94b..6ed7a0d 100644 --- a/pinpoint-mysql/Readme.md +++ b/pinpoint-mysql/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat ## Supported Tags + - 2.4.0 - 2.3.3 - 2.3.2 - 2.3.1 diff --git a/pinpoint-quickstart/.env b/pinpoint-quickstart/.env index a133672..cddf340 100644 --- a/pinpoint-quickstart/.env +++ b/pinpoint-quickstart/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.3 +PINPOINT_VERSION=2.4.0 SPRING_PROFILES=release ### Pinpoint-Agent diff --git a/pinpoint-quickstart/Readme.md b/pinpoint-quickstart/Readme.md index 921e06a..ad6a96c 100644 --- a/pinpoint-quickstart/Readme.md +++ b/pinpoint-quickstart/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Quickstart sample to test Pinpoint appli ## Supported Tags + - 2.4.0 - 2.3.3 - 2.3.2 - 2.3.1 diff --git a/pinpoint-web/.env b/pinpoint-web/.env index 28113b9..da78974 100644 --- a/pinpoint-web/.env +++ b/pinpoint-web/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.3 +PINPOINT_VERSION=2.4.0 SPRING_PROFILES=release ### Pinpoint-Web diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index e977c32..8401827 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -1,6 +1,6 @@ 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 RUN mkdir -p /pinpoint/config \ @@ -9,7 +9,7 @@ RUN mkdir -p /pinpoint/config \ COPY /build/config/pinpoint-web.properties /pinpoint/config/ COPY /build/scripts/start-web.sh /pinpoint/scripts/ #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 \ && chmod a+x /pinpoint/scripts/start-web.sh \ diff --git a/pinpoint-web/Readme.md b/pinpoint-web/Readme.md index 36a278a..0e7d251 100644 --- a/pinpoint-web/Readme.md +++ b/pinpoint-web/Readme.md @@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio ## Supported Tags + - 2.4.0 - 2.3.3 - 2.3.2 - 2.3.1