From e9ee172b2af7d331d0ca93bdf3e5152aa19826b7 Mon Sep 17 00:00:00 2001 From: linrunqi08 Date: Mon, 14 Oct 2024 00:28:52 +0000 Subject: [PATCH] update version --- CHANGELOG.md | 1 - Makefile | 2 +- changes/v0.1.0.md | 29 ++++++++++++++++++++++ core/options.cmake | 2 +- docker/Dockerfile_build | 2 +- docker/Dockerfile_development_part | 2 +- docker/Dockerfile_e2e | 2 +- docker/Dockerfile_production | 4 +-- docker/Dockerfile_production_minimal | 4 +-- docs/en/guides/How-to-build-with-docker.md | 4 +-- scripts/docker_build.sh | 2 +- scripts/gen_build_scripts.sh | 2 +- scripts/plugin_build.sh | 2 +- scripts/windows32_build.bat | 2 +- scripts/windows64_build.bat | 2 +- scripts/windows64_dist.bat | 2 +- 16 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 changes/v0.1.0.md diff --git a/CHANGELOG.md b/CHANGELOG.md index dd883da34f..69cbd0aaa3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,4 +36,3 @@ your changes, such as: - [public] [both] [updated] add a new feature ## [Unreleased] -- [inner] [both] [updated] Support SLS Metricstore output \ No newline at end of file diff --git a/Makefile b/Makefile index 8ba616e018..2f3b26433c 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # limitations under the License. .DEFAULT_GOAL := all -VERSION ?= 0.0.1 +VERSION ?= 0.1.0 DOCKER_PUSH ?= false DOCKER_REPOSITORY ?= aliyun/loongcollector BUILD_REPOSITORY ?= aliyun/loongcollector_build diff --git a/changes/v0.1.0.md b/changes/v0.1.0.md new file mode 100644 index 0000000000..922c772274 --- /dev/null +++ b/changes/v0.1.0.md @@ -0,0 +1,29 @@ +# 0.1.0 + +## Changes + +All issues and pull requests are [here](https://github.com/alibaba/ilogtail/milestone/25). + +### Features + + +### Fixed + + +### Doc + + +## Download + +| **Filename** | **OS** | **Arch** | **SHA256 Checksum** | +| ---- | ---- | ---- | ---- | +|[ilogtail-0.1.0.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/0.1.0/ilogtail-0.1.0.linux-amd64.tar.gz)|Linux|x86-64|[ilogtail-0.1.0.linux-amd64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/0.1.0/ilogtail-0.1.0.linux-amd64.tar.gz.sha256)| +|[ilogtail-0.1.0.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/0.1.0/ilogtail-0.1.0.linux-arm64.tar.gz)|Linux|arm64|[ilogtail-0.1.0.linux-arm64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/0.1.0/ilogtail-0.1.0.linux-arm64.tar.gz.sha256)| +|[ilogtail-0.1.0.windows-amd64.zip](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/0.1.0/ilogtail-0.1.0.windows-amd64.zip)|Windows|x86-64|[ilogtail-0.1.0.windows-amd64.zip.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/0.1.0/ilogtail-0.1.0.windows-amd64.zip.sha256)| + +## Docker Image + +**Docker Pull Command** +``` bash +docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:0.1.0 +``` diff --git a/core/options.cmake b/core/options.cmake index 79881d7c98..88c25498b7 100644 --- a/core/options.cmake +++ b/core/options.cmake @@ -14,7 +14,7 @@ # Name/Version information. if (NOT DEFINED LOGTAIL_VERSION) - set(LOGTAIL_VERSION "0.0.1") + set(LOGTAIL_VERSION "0.1.0") endif () message(STATUS "Version: ${LOGTAIL_VERSION}") diff --git a/docker/Dockerfile_build b/docker/Dockerfile_build index eb1a7545ba..14f1fdea21 100644 --- a/docker/Dockerfile_build +++ b/docker/Dockerfile_build @@ -19,7 +19,7 @@ WORKDIR /src COPY . . ARG HOST_OS=Linux -ARG VERSION=0.0.1 +ARG VERSION=0.1.0 USER root diff --git a/docker/Dockerfile_development_part b/docker/Dockerfile_development_part index b5282bb50a..507a8870f9 100644 --- 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:2.0.3 ARG HOST_OS=Linux -ARG VERSION=0.0.1 +ARG VERSION=0.1.0 USER root WORKDIR /loongcollector diff --git a/docker/Dockerfile_e2e b/docker/Dockerfile_e2e index 1321a35ec7..0d8ec0cdca 100644 --- a/docker/Dockerfile_e2e +++ b/docker/Dockerfile_e2e @@ -15,7 +15,7 @@ FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.3 ARG HOST_OS=Linux -ARG VERSION=0.0.1 +ARG VERSION=0.1.0 USER root WORKDIR /loongcollector diff --git a/docker/Dockerfile_production b/docker/Dockerfile_production index 95b618b840..afd89778cc 100644 --- a/docker/Dockerfile_production +++ b/docker/Dockerfile_production @@ -13,7 +13,7 @@ # limitations under the License. FROM --platform=$TARGETPLATFORM centos:centos7.9.2009 as build -ARG VERSION=0.0.1 +ARG VERSION=0.1.0 ARG TARGETPLATFORM WORKDIR /usr/local COPY dist/loongcollector-${VERSION}.linux-*.tar.gz . @@ -30,7 +30,7 @@ RUN curl -L -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/ RUN yum update -y && yum upgrade -y && yum -y clean all && rm -fr /var/cache && rm -rf /core.* ARG HOST_OS=Linux -ARG VERSION=0.0.1 +ARG VERSION=0.1.0 ARG TARGETPLATFORM COPY --from=build /usr/local/loongcollector-${VERSION} /usr/local/loongcollector diff --git a/docker/Dockerfile_production_minimal b/docker/Dockerfile_production_minimal index 71071a4416..fd7bfd047b 100644 --- a/docker/Dockerfile_production_minimal +++ b/docker/Dockerfile_production_minimal @@ -13,7 +13,7 @@ # limitations under the License. FROM --platform=$TARGETPLATFORM debian:bookworm as build -ARG VERSION=0.0.1 +ARG VERSION=0.1.0 ARG TARGETPLATFORM ARG UID=65532 WORKDIR /usr/local @@ -30,7 +30,7 @@ LABEL org.opencontainers.image.authors="yyuuttaaoo@gmail.com, jiangdeyan@gmail.c COPY --from=build /usr/lib/x86_64-linux-gnu/libuuid.so.1.3.0 /lib/x86_64-linux-gnu/libuuid.so.1 ARG HOST_OS=Linux -ARG VERSION=0.0.1 +ARG VERSION=0.1.0 ARG TARGETPLATFORM COPY --from=build --chown=$UID:$UID /usr/local/loongcollector /usr/local/loongcollector diff --git a/docs/en/guides/How-to-build-with-docker.md b/docs/en/guides/How-to-build-with-docker.md index e3d03d7723..4200f552f7 100644 --- a/docs/en/guides/How-to-build-with-docker.md +++ b/docs/en/guides/How-to-build-with-docker.md @@ -17,7 +17,7 @@ make solib ### Build image - The default {DOCKER_REPOSITORY} is `aliyun/ilogtail`. - - The default {VERSION} is `2.0.0`. + - The default {VERSION} is `0.1.0`. - 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 @@ -32,7 +32,7 @@ If the features that you want to use only in Go part, such as collecting stdout ### Build image - The default {DOCKER_REPOSITORY} is `aliyun/ilogtail`. - - The default {VERSION} is `2.0.0`. + - The default {VERSION} is `0.1.0`. - 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 diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh index 66b07f73e2..77083772e1 100755 --- a/scripts/docker_build.sh +++ b/scripts/docker_build.sh @@ -56,7 +56,7 @@ function check_docker_buildkit_support { ARCH=$(arch) CATEGORY=$1 GENERATED_HOME=$2 -VERSION=${3:-0.0.1} +VERSION=${3:-0.1.0} REPOSITORY=${4:-aliyun/loongcollector} PUSH=${5:-false} USE_DOCKER_BUILDKIT=${6:-${DOCKER_BUILD_USE_BUILDKIT:-$(check_docker_buildkit_support)}} diff --git a/scripts/gen_build_scripts.sh b/scripts/gen_build_scripts.sh index bc65b2e303..863c23134c 100755 --- 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:-0.0.1} +VERSION=${3:-0.1.0} REPOSITORY=${4:-aliyun/loongcollector} OUT_DIR=${5:-output} EXPORT_GO_ENVS=${6:-${DOCKER_BUILD_EXPORT_GO_ENVS:-true}} diff --git a/scripts/plugin_build.sh b/scripts/plugin_build.sh index fa70e344de..8fe6ca6c2e 100755 --- a/scripts/plugin_build.sh +++ b/scripts/plugin_build.sh @@ -27,7 +27,7 @@ function os() { MOD=${1:-mod} BUILDMODE=${2:-default} OUT_DIR=${3:-output} -VERSION=${4:-0.0.1} +VERSION=${4:-0.1.0} PLUGINS_CONFIG_FILE=${5:-${PLUGINS_CONFIG_FILE:-plugins.yml,external_plugins.yml}} GO_MOD_FILE=${6:-${GO_MOD_FILE:-go.mod}} NAME=ilogtail diff --git a/scripts/windows32_build.bat b/scripts/windows32_build.bat index 7aea286b36..a93957d5b4 100644 --- a/scripts/windows32_build.bat +++ b/scripts/windows32_build.bat @@ -6,7 +6,7 @@ REM 2. Build iLogtail. REM 3. Build iLogtail plugin. REM 4. Make package. -set ILOGTAIL_VERSION=2.0.0 +set ILOGTAIL_VERSION=0.1.0 if not "%1" == "" set ILOGTAIL_VERSION=%1 set CurrentPath=%~dp0 set P1Path= diff --git a/scripts/windows64_build.bat b/scripts/windows64_build.bat index 17ec0f8db4..d7bfe81b08 100644 --- a/scripts/windows64_build.bat +++ b/scripts/windows64_build.bat @@ -6,7 +6,7 @@ REM 2. Build iLogtail. REM 3. Build iLogtail plugin. REM 4. Make package. -set ILOGTAIL_VERSION=2.0.0 +set ILOGTAIL_VERSION=0.1.0 if not "%1" == "" set ILOGTAIL_VERSION=%1 set CurrentPath=%~dp0 set P1Path= diff --git a/scripts/windows64_dist.bat b/scripts/windows64_dist.bat index 791347c7f7..9117721656 100644 --- a/scripts/windows64_dist.bat +++ b/scripts/windows64_dist.bat @@ -5,7 +5,7 @@ REM 1. Set environments. REM 2. Copy output to dist package dir. REM 3. Pack dir to zip archive. -set ILOGTAIL_VERSION=2.0.0 +set ILOGTAIL_VERSION=0.1.0 if not "%1" == "" set ILOGTAIL_VERSION=%1 set CurrentPath=%~dp0 set P1Path=