update version

alibaba · Sep 29, 2022 · 7928895 · 7928895
1 parent 2b676ce
commit 7928895
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 .DEFAULT_GOAL := all
-VERSION ?= 1.2.0
+VERSION ?= 1.2.1
 DOCKER_PUSH ?= false
 DOCKER_REPOSITORY ?= aliyun/ilogtail
 BUILD_REPOSITORY ?= aliyun/ilogtail_build

diff --git a/changes/v1.2.0.md → changes/v1.2.1.md b/changes/v1.2.0.md → changes/v1.2.1.md
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -22,7 +22,7 @@ option(ENABLE_STATIC_LINK_CRT "Build Logtail by linking CRT statically" OFF)
 
 # Name/Version information.
 if (NOT DEFINED LOGTAIL_VERSION)
-    set(LOGTAIL_VERSION "1.2.0")
+    set(LOGTAIL_VERSION "1.2.1")
 endif ()
 message(STATUS "Version: ${LOGTAIL_VERSION}")
 

diff --git a/docker/Dockerfile_build b/docker/Dockerfile_build
@@ -19,6 +19,6 @@ WORKDIR /src
 COPY . .
 
 ARG HOST_OS=Linux
-ARG VERSION=1.2.0
+ARG VERSION=1.2.1
 
 RUN sudo chown -R $(whoami) /src /opt/logtail && sh generated_files/gen_build.sh
diff --git a/docker/Dockerfile_development_part b/docker/Dockerfile_development_part
@@ -15,7 +15,7 @@
 FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:latest
 
 ARG HOST_OS=Linux
-ARG VERSION=1.2.0
+ARG VERSION=1.2.1
 
 USER root
 WORKDIR /ilogtail

diff --git a/docker/Dockerfile_production b/docker/Dockerfile_production
@@ -28,7 +28,7 @@ VOLUME [ "/sys/fs/cgroup" ]
 RUN yum update -y && yum upgrade -y && yum -y clean all && rm -fr /var/cache && rm -rf /core.*
 
 ARG HOST_OS=Linux
-ARG VERSION=1.2.0
+ARG VERSION=1.2.1
 
 ADD ilogtail-${VERSION}.tar.gz /usr/local/
 RUN mv /usr/local/ilogtail-${VERSION} /usr/local/ilogtail && \

diff --git a/docs/en/guides/How-to-build-with-docker.md b/docs/en/guides/How-to-build-with-docker.md
@@ -13,24 +13,24 @@ make solib
 
 ### Build image. 
     - The default {DOCKER_REPOSITORY} is `aliyun/ilogtail`.
-    - The default {VERSION} is `1.2.0`.
+    - The default {VERSION} is `1.2.1`.
     - The default {DOCKER_PUSH} is `false`. When the option is configured as true, the built images would also be pushed to the {DOCKER_REPOSITORY} with {VERSION} tag.
 
     ```shell
         DOCKER_PUSH={DOCKER_PUSH} DOCKER_REPOSITORY={DOCKER_REPOSITORY} VERSION={VERSION} make wholedocker
     ```
-   So when you exec `make wholedocker` command, the built image named as `aliyun/ilogtail:1.2.0` would be stored in local repository.
+   So when you exec `make wholedocker` command, the built image named as `aliyun/ilogtail:1.2.1` would be stored in local repository.
 
 
 ## Build Pure Go image.
 If the features that you want to use only in Go part, such as collecting stdout logs or metrics inputs, you cloud build a pure Go image to use.
 
 ### Build image.
     - The default {DOCKER_REPOSITORY} is `aliyun/ilogtail`.
-    - The default {VERSION} is `1.2.0`.
+    - The default {VERSION} is `1.2.1`.
     - The default {DOCKER_PUSH} is `false`. When the option is configured as true, the built images would also be pushed to the {DOCKER_REPOSITORY} with {VERSION} tag.
 
     ```shell
         DOCKER_PUSH={DOCKER_PUSH} DOCKER_REPOSITORY={DOCKER_REPOSITORY} VERSION={VERSION} make docker
     ```
-So when you exec `make docker` command, the built image named as `aliyun/ilogtail:1.2.0` would be stored in local repository.
+So when you exec `make docker` command, the built image named as `aliyun/ilogtail:1.2.1` would be stored in local repository.
diff --git a/docs/en/guides/How-to-do-manual-test.md b/docs/en/guides/How-to-do-manual-test.md
@@ -114,8 +114,8 @@ program written by yourself.
 ### Run [Logtail AlibabaCloud](https://help.aliyun.com/document_detail/28979.html) on container
 
 1. Run `make docker` to compile [Logtail AlibabaCloud](https://help.aliyun.com/document_detail/28979.html) docker
-   images named `aliyun/ilogtail:1.2.0`.
-2. Rename `aliyun/ilogtail:1.2.0` to a custom name and push to the remotes, such
-   as `registry.cn-beijing.aliyuncs.com/aliyun/ilogtail:1.2.0`.
+   images named `aliyun/ilogtail:1.2.1`.
+2. Rename `aliyun/ilogtail:1.2.1` to a custom name and push to the remotes, such
+   as `registry.cn-beijing.aliyuncs.com/aliyun/ilogtail:1.2.1`.
 3. Replace the mirror of `logtail-ds` of [ACK](https://www.aliyun.com/product/list/alibabacloudnative) or your self
    platform and restart.
diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh
@@ -25,7 +25,7 @@ set -o pipefail
 # production: build ilogtail production images.
 CATEGORY=$1
 GENERATED_HOME=$2
-VERSION=${3:-1.2.0}
+VERSION=${3:-1.2.1}
 REPOSITORY=${4:-aliyun/ilogtail}
 PUSH=${5:-false}
 

diff --git a/scripts/gen_build_scripts.sh b/scripts/gen_build_scripts.sh
@@ -24,7 +24,7 @@ set -o pipefail
 # e2e: Build plugin dynamic lib with GOC and build the CPP part.
 CATEGORY=$1
 GENERATED_HOME=$2
-VERSION=${3:-1.2.0}
+VERSION=${3:-1.2.1}
 REPOSITORY=${4:-aliyun/ilogtail}
 OUT_DIR=${5:-output}
 

diff --git a/test/engine/boot/compose.go b/test/engine/boot/compose.go
@@ -54,7 +54,7 @@ services:
       interval: 1s
       retries: 10
   ilogtailC:
-    image: aliyun/ilogtail:1.2.0
+    image: aliyun/ilogtail:1.2.1
     hostname: ilogtail
     privileged: true
     pid: host