Skip to content

Commit

Permalink
update version
Browse files Browse the repository at this point in the history
  • Loading branch information
linrunqi08 committed Nov 27, 2024
1 parent 66eafb3 commit d040dbd
Show file tree
Hide file tree
Showing 18 changed files with 49 additions and 20 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ your changes, such as:
- [public] [both] [updated] add a new feature

## [Unreleased]
- [inner] [both] [updated] Support SLS Metricstore output
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

.DEFAULT_GOAL := all
VERSION ?= 0.0.1
VERSION ?= loongcollector-0.2.0
DOCKER_PUSH ?= false
DOCKER_REPOSITORY ?= aliyun/loongcollector
BUILD_REPOSITORY ?= aliyun/loongcollector_build
Expand Down
30 changes: 30 additions & 0 deletions changes/vloongcollector-0.2.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# loongcollector-0.2.0

## Changes

All issues and pull requests are [here](https://github.com/alibaba/ilogtail/milestone/25).

### Features

- [inner] [both] [updated] Support SLS Metricstore output

### Fixed


### Doc


## Download

| **Filename** | **OS** | **Arch** | **SHA256 Checksum** |
| ---- | ---- | ---- | ---- |
|[ilogtail-loongcollector-0.2.0.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/loongcollector-0.2.0/ilogtail-loongcollector-0.2.0.linux-amd64.tar.gz)|Linux|x86-64|[ilogtail-loongcollector-0.2.0.linux-amd64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/loongcollector-0.2.0/ilogtail-loongcollector-0.2.0.linux-amd64.tar.gz.sha256)|
|[ilogtail-loongcollector-0.2.0.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/loongcollector-0.2.0/ilogtail-loongcollector-0.2.0.linux-arm64.tar.gz)|Linux|arm64|[ilogtail-loongcollector-0.2.0.linux-arm64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/loongcollector-0.2.0/ilogtail-loongcollector-0.2.0.linux-arm64.tar.gz.sha256)|
|[ilogtail-loongcollector-0.2.0.windows-amd64.zip](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/loongcollector-0.2.0/ilogtail-loongcollector-0.2.0.windows-amd64.zip)|Windows|x86-64|[ilogtail-loongcollector-0.2.0.windows-amd64.zip.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/loongcollector-0.2.0/ilogtail-loongcollector-0.2.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:loongcollector-0.2.0
```
2 changes: 1 addition & 1 deletion core/options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# Name/Version information.
if (NOT DEFINED LOGTAIL_VERSION)
set(LOGTAIL_VERSION "0.0.1")
set(LOGTAIL_VERSION "loongcollector-0.2.0")
endif ()
message(STATUS "Version: ${LOGTAIL_VERSION}")

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_build
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ WORKDIR /src
COPY . .

ARG HOST_OS=Linux
ARG VERSION=0.0.1
ARG VERSION=loongcollector-0.2.0

USER root

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_development_part
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.0.5

ARG HOST_OS=Linux
ARG VERSION=0.0.1
ARG VERSION=loongcollector-0.2.0

USER root
WORKDIR /loongcollector
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_e2e
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.0.5

ARG HOST_OS=Linux
ARG VERSION=0.0.1
ARG VERSION=loongcollector-0.2.0

USER root
WORKDIR /loongcollector
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile_production
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

FROM --platform=$TARGETPLATFORM centos:centos7.9.2009 as build
ARG VERSION=0.0.1
ARG VERSION=loongcollector-0.2.0
ARG TARGETPLATFORM
WORKDIR /usr/local
COPY dist/loongcollector-${VERSION}.linux-*.tar.gz .
Expand All @@ -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=loongcollector-0.2.0
ARG TARGETPLATFORM

COPY --from=build /usr/local/loongcollector-${VERSION} /usr/local/loongcollector
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile_production_minimal
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

FROM --platform=$TARGETPLATFORM debian:bookworm as build
ARG VERSION=0.0.1
ARG VERSION=loongcollector-0.2.0
ARG TARGETPLATFORM
ARG UID=65532
WORKDIR /usr/local
Expand All @@ -31,7 +31,7 @@ LABEL org.opencontainers.image.authors="[email protected], [email protected]
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=loongcollector-0.2.0
ARG TARGETPLATFORM

COPY --from=build --chown=$UID:$UID /usr/local/loongcollector /usr/local/loongcollector
Expand Down
4 changes: 2 additions & 2 deletions docs/en/guides/How-to-build-with-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `loongcollector-0.2.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
Expand All @@ -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 `loongcollector-0.2.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
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function check_docker_buildkit_support {
ARCH=$(arch)
CATEGORY=$1
GENERATED_HOME=$2
VERSION=${3:-0.0.1}
VERSION=${3:-loongcollector-0.2.0}
REPOSITORY=${4:-aliyun/loongcollector}
PUSH=${5:-false}
USE_DOCKER_BUILDKIT=${6:-${DOCKER_BUILD_USE_BUILDKIT:-$(check_docker_buildkit_support)}}
Expand Down
2 changes: 1 addition & 1 deletion scripts/gen_build_scripts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:-loongcollector-0.2.0}
REPOSITORY=${4:-aliyun/loongcollector}
OUT_DIR=${5:-output}
EXPORT_GO_ENVS=${6:-${DOCKER_BUILD_EXPORT_GO_ENVS:-true}}
Expand Down
2 changes: 1 addition & 1 deletion scripts/plugin_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function os() {
MOD=${1:-mod}
BUILDMODE=${2:-default}
OUT_DIR=${3:-output}
VERSION=${4:-0.0.1}
VERSION=${4:-loongcollector-0.2.0}
PLUGINS_CONFIG_FILE=${5:-${PLUGINS_CONFIG_FILE:-plugins.yml,external_plugins.yml}}
GO_MOD_FILE=${6:-${GO_MOD_FILE:-go.mod}}
NAME=ilogtail
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sed -i "s/VERSION=\${3:-.*}/VERSION=\${3:-$version}/g" scripts/*.sh
sed -i "s/VERSION=\${4:-.*}/VERSION=\${4:-$version}/g" scripts/*.sh
sed -i "s/DIST_DIR=\${2:-loongcollector-.*}/DIST_DIR=\${2:-loongcollector-$version}/g" scripts/dist.sh
sed -i "s/^set ILOGTAIL_VERSION=.*/set ILOGTAIL_VERSION=$version/g" scripts/*.bat
sed -i "s/image: aliyun\\/loongcollector:.*/image: aliyun\\/loongcollector:$version/g" test/engine/boot/compose.go
sed -i "s/image: aliyun\\/loongcollector:.*/image: aliyun\\/loongcollector:$version/g" test/engine/setup/dockercompose/compose.go

# Docs
sed -i "s/aliyun\\/loongcollector:[^\` ]*/aliyun\\/loongcollector:$version/g" \
Expand Down
2 changes: 1 addition & 1 deletion scripts/windows32_build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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=loongcollector-0.2.0
if not "%1" == "" set ILOGTAIL_VERSION=%1
set CurrentPath=%~dp0
set P1Path=
Expand Down
2 changes: 1 addition & 1 deletion scripts/windows64_build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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=loongcollector-0.2.0
if not "%1" == "" set ILOGTAIL_VERSION=%1
set CurrentPath=%~dp0
set P1Path=
Expand Down
2 changes: 1 addition & 1 deletion scripts/windows64_dist.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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=loongcollector-0.2.0
if not "%1" == "" set ILOGTAIL_VERSION=%1
set CurrentPath=%~dp0
set P1Path=
Expand Down
2 changes: 1 addition & 1 deletion test/engine/setup/dockercompose/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ services:
interval: 1s
retries: 10
loongcollectorC:
image: aliyun/loongcollector:0.0.1
image: aliyun/loongcollector:loongcollector-0.2.0
hostname: loongcollector
privileged: true
pid: host
Expand Down

0 comments on commit d040dbd

Please sign in to comment.