From cbd4ea436c2c995f842cb87ba3c13528bb549460 Mon Sep 17 00:00:00 2001 From: ga-ram Date: Tue, 14 Dec 2021 14:20:21 +0900 Subject: [PATCH] Revert "Release 2.3.2" This reverts commit 2a0a9c506166ad27481dd5cfa3065dc36c58bfa5. --- .env | 2 +- Readme.md | 1 - pinpoint-agent-attach-example/java/.env | 2 +- pinpoint-agent-attach-example/tomcat/.env | 2 +- pinpoint-agent/.env | 2 +- pinpoint-agent/Dockerfile | 2 +- pinpoint-agent/Readme.md | 1 - pinpoint-collector/.env | 2 +- pinpoint-collector/Dockerfile | 4 ++-- pinpoint-collector/Readme.md | 2 -- pinpoint-flink/.env | 2 +- pinpoint-flink/Dockerfile | 2 +- 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 - 24 files changed, 18 insertions(+), 27 deletions(-) diff --git a/.env b/.env index dc6023a..9617223 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.2 +PINPOINT_VERSION=2.3.1 SPRING_PROFILES=release #zookeeper information required PINPOINT_ZOOKEEPER_ADDRESS=zoo1 diff --git a/Readme.md b/Readme.md index c657529..fbb1f71 100644 --- a/Readme.md +++ b/Readme.md @@ -13,7 +13,6 @@ It supports and helps you understand your application in a glance and allow you ## Supported Tags - - 2.3.2 - 2.3.1 - 2.3.0 - 2.2.2 diff --git a/pinpoint-agent-attach-example/java/.env b/pinpoint-agent-attach-example/java/.env index a3c927d..fdb5922 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.2 +PINPOINT_VERSION=2.3.1 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 926b1aa..5277c56 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.2 +PINPOINT_VERSION=2.3.1 SPRING_PROFILES=release APP_PORT=8000 AGENT_ID=app-in-docker diff --git a/pinpoint-agent/.env b/pinpoint-agent/.env index 266d2f3..aa5d077 100644 --- a/pinpoint-agent/.env +++ b/pinpoint-agent/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.2 +PINPOINT_VERSION=2.3.1 SPRING_PROFILES=release ### Pinpoint-Agent diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile index 49db41e..0f16dfe 100644 --- a/pinpoint-agent/Dockerfile +++ b/pinpoint-agent/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1} ARG INSTALL_URL=https://github.com/naver/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 6d0b7fe..de26e6e 100644 --- a/pinpoint-agent/Readme.md +++ b/pinpoint-agent/Readme.md @@ -5,7 +5,6 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat ## Supported Tags - - 2.3.2 - 2.3.1 - 2.3.0 - 2.2.2 diff --git a/pinpoint-collector/.env b/pinpoint-collector/.env index 41d71b5..5c2548e 100644 --- a/pinpoint-collector/.env +++ b/pinpoint-collector/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.2 +PINPOINT_VERSION=2.3.1 SPRING_PROFILES=release ### Pinpoint-Collector diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile index 64f64cd..0adcbc3 100644 --- a/pinpoint-collector/Dockerfile +++ b/pinpoint-collector/Dockerfile @@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.2} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar RUN mkdir -p /pinpoint/config \ @@ -11,7 +11,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.2-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar +#COPY /pinpoint-collector-boot-2.3.1-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 657cfd6..4e566af 100644 --- a/pinpoint-collector/Readme.md +++ b/pinpoint-collector/Readme.md @@ -4,8 +4,6 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint application monitoring system. ## Supported Tags - - - 2.3.2 - 2.3.1 - 2.3.0 - 2.2.2 diff --git a/pinpoint-flink/.env b/pinpoint-flink/.env index b7aa859..49c90f0 100644 --- a/pinpoint-flink/.env +++ b/pinpoint-flink/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.2 +PINPOINT_VERSION=2.3.1 ### Pinpoint-flink diff --git a/pinpoint-flink/Dockerfile b/pinpoint-flink/Dockerfile index 1e45d1d..1b9a8c0 100644 --- a/pinpoint-flink/Dockerfile +++ b/pinpoint-flink/Dockerfile @@ -1,5 +1,5 @@ FROM flink:1.7 -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.2} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1} 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 e5b83d4..997f621 100644 --- a/pinpoint-flink/Readme.md +++ b/pinpoint-flink/Readme.md @@ -5,7 +5,6 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat ## Supported Tags - - 2.3.2 - 2.3.1 - 2.3.0 - 2.2.2 diff --git a/pinpoint-hbase/.env b/pinpoint-hbase/.env index 5e3ab77..b1d2566 100644 --- a/pinpoint-hbase/.env +++ b/pinpoint-hbase/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.2 +PINPOINT_VERSION=2.3.1 ### Pinpoint-Hbase diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile index 2e8b475..b66b35e 100644 --- a/pinpoint-hbase/Dockerfile +++ b/pinpoint-hbase/Dockerfile @@ -2,7 +2,7 @@ FROM java:8-jdk LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.2} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1} 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 e5b83d4..997f621 100644 --- a/pinpoint-hbase/Readme.md +++ b/pinpoint-hbase/Readme.md @@ -5,7 +5,6 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat ## Supported Tags - - 2.3.2 - 2.3.1 - 2.3.0 - 2.2.2 diff --git a/pinpoint-mysql/.env b/pinpoint-mysql/.env index 516d344..87009cb 100644 --- a/pinpoint-mysql/.env +++ b/pinpoint-mysql/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.2 +PINPOINT_VERSION=2.3.1 ### Pinpoint-mysql MYSQL_ROOT_PASSWORD=root123 diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index 75f3ae7..800417b 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -1,6 +1,6 @@ FROM mysql:5.7 -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.2} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1} 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 9b00094..3658aef 100644 --- a/pinpoint-mysql/Readme.md +++ b/pinpoint-mysql/Readme.md @@ -5,7 +5,6 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat ## Supported Tags - - 2.3.2 - 2.3.1 - 2.3.0 - 2.2.2 diff --git a/pinpoint-quickstart/.env b/pinpoint-quickstart/.env index f8e748e..09e6795 100644 --- a/pinpoint-quickstart/.env +++ b/pinpoint-quickstart/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.2 +PINPOINT_VERSION=2.3.1 SPRING_PROFILES=release ### Pinpoint-Agent diff --git a/pinpoint-quickstart/Readme.md b/pinpoint-quickstart/Readme.md index b8031d1..16d3d55 100644 --- a/pinpoint-quickstart/Readme.md +++ b/pinpoint-quickstart/Readme.md @@ -5,7 +5,6 @@ This Docker image contains the Pinpoint Quickstart sample to test Pinpoint appli ## Supported Tags - - 2.3.2 - 2.3.1 - 2.3.0 - 2.2.2 diff --git a/pinpoint-web/.env b/pinpoint-web/.env index 91ddd4a..c2604d0 100644 --- a/pinpoint-web/.env +++ b/pinpoint-web/.env @@ -1,4 +1,4 @@ -PINPOINT_VERSION=2.3.2 +PINPOINT_VERSION=2.3.1 SPRING_PROFILES=release ### Pinpoint-Web diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile index 8da688c..a6e43cf 100644 --- a/pinpoint-web/Dockerfile +++ b/pinpoint-web/Dockerfile @@ -2,7 +2,7 @@ FROM openjdk:8-jdk-alpine LABEL maintainer="Roy Kim " -ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.2} +ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.3.1} ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar RUN mkdir -p /pinpoint/config \ @@ -11,7 +11,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.2-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar +#COPY /pinpoint-web-boot-2.3.1-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 7b12c40..61f4839 100644 --- a/pinpoint-web/Readme.md +++ b/pinpoint-web/Readme.md @@ -5,7 +5,6 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio ## Supported Tags - - 2.3.2 - 2.3.1 - 2.3.0 - 2.2.2