Release 2.4.0

2022-05-30 19:41:05 +09:00 · 2022-05-30 19:41:05 +09:00 · 8eface18ad
parent 0da267c489
commit 8eface18ad
27 changed files with 47 additions and 21 deletions
--- 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
--- 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
--- 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
--- 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
--- 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/
--- 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
--- 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
--- 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 \
--- a/pinpoint-batch/build/config/pinpoint-batch.properties
+++ 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=
--- a/pinpoint-batch/build/scripts/start-batch.sh
+++ 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
--- 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
--- 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 \
--- 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
--- a/pinpoint-flink/.env
+++ b/pinpoint-flink/.env
@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.3.3
+PINPOINT_VERSION=2.4.0

 ### Pinpoint-flink

--- 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 \
--- 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
--- a/pinpoint-hbase/.env
+++ b/pinpoint-hbase/.env
@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.3.3
+PINPOINT_VERSION=2.4.0

 ### Pinpoint-Hbase

--- 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
--- 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
--- 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
--- 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 \
--- 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
--- 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
--- 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
--- 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
--- 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 \
--- 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