chore: update CI base image (#2044)

* chore: update CI base image * fix src dir ownership --------- Co-authored-by: Tom Yu <[email protected]>
alibaba · Jan 20, 2025 · 766ab94 · 766ab94
1 parent e563035
commit 766ab94
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 16 deletions.
diff --git a/config_server/service/Dockerfile b/config_server/service/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.0.5 as build
+FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.1 as build
 
 USER root
 WORKDIR /src
@@ -21,7 +21,7 @@ RUN go env -w GOPROXY="https://goproxy.cn,direct" && \
     go build -o ConfigServer
 
 FROM centos:centos7.9.2009
-MAINTAINER TomYu [email protected]
+LABEL maintainer="TomYu <[email protected]>"
 
 ENV container docker
 

diff --git a/docker/Dockerfile_build b/docker/Dockerfile_build
@@ -12,15 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.0.5 as build
+FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.1 as build
 
+USER root
 WORKDIR /src
-
 COPY . .
 
 ARG HOST_OS=Linux
 ARG VERSION=0.0.1
 
-USER root
-
 RUN --mount=type=ssh sh generated_files/gen_build.sh
diff --git a/docker/Dockerfile_coverage b/docker/Dockerfile_coverage
@@ -12,10 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.0.5
-
-WORKDIR /src
+FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.1
 
 USER root
+WORKDIR /src
 
 CMD ["bash", "-c", "gcovr --gcov-ignore-errors=no_working_dir_found --root . --json coverage.json --json-summary-pretty --json-summary summary.json -e \".*sdk.*\" -e \".*logger.*\" -e \".*unittest.*\" -e \".*config_server.*\" -e \".*go_pipeline.*\" -e \".*application.*\" -e \".*protobuf.*\" -e \".*runner.*\""]
diff --git a/docker/Dockerfile_development_part b/docker/Dockerfile_development_part
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.0.5
+FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.1
 
 ARG HOST_OS=Linux
 ARG VERSION=0.0.1

diff --git a/docker/Dockerfile_e2e b/docker/Dockerfile_e2e
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.0.5
+FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.1
 
 ARG HOST_OS=Linux
 ARG VERSION=0.0.1

diff --git a/docker/Dockerfile_goc b/docker/Dockerfile_goc
@@ -14,7 +14,7 @@
 
 # goc server is only for e2e test to analysis code coverage.
 
-FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.0.5 as build
+FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.1 as build
 
 USER root
 ENTRYPOINT ["goc","server"]
diff --git a/docker/Dockerfile_production b/docker/Dockerfile_production
@@ -21,7 +21,7 @@ RUN tar -xzf loongcollector-${VERSION}.linux-${TARGETPLATFORM##*/}.tar.gz
 
 
 FROM centos:centos7.9.2009
-MAINTAINER TomYu [email protected]
+LABEL maintainer="TomYu <[email protected]>"
 
 ENV container docker
 

diff --git a/docs/cn/developer-guide/development-environment.md b/docs/cn/developer-guide/development-environment.md
@@ -84,7 +84,7 @@ go install ...
 
 ```json
 {
-  "image": "sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.0.5",
+  "image": "sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.1",
   "customizations": {
     "vscode": {
       "extensions": [
@@ -187,7 +187,7 @@ cp -a ./core/build/go_pipeline/libPluginAdapter.so ./output
 ```bash
 docker run --name loongcollector-build -d \
   -v `pwd`:/src -w /src \
-  sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.0.5 \
+  sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/loongcollector-community-edition/loongcollector-build-linux:2.1.1 \
   bash -c "sleep infinity"
 ```
 

diff --git a/docs/cn/installation/release-notes/release-notes.md b/docs/cn/installation/release-notes/release-notes.md
@@ -73,7 +73,7 @@ LoongCollector 是一款集卓越性能、超强稳定性和灵活可编程性
 
 1. 文件目录布局与文件命名跟 iLogtail 2.0 版本有所变化，如果某些环境对特定目录、文件有所依赖，则需要注意该变化。
 2. 部分自监控指标命名跟 iLogtail 2.0 版本不一致，LoongCollector 重新规范了所有自监控指标的命名和上报方式。
-3. 开发镜像升级，新增部分依赖库。使用 iLogtail 开发镜像开发 Loongcollector 会出现依赖库链接错误。建议使用loongcollector 开发镜像 2.0.5 版本及以上。
+3. 开发镜像升级，新增部分依赖库。使用 iLogtail 开发镜像开发 Loongcollector 会出现依赖库链接错误。建议使用loongcollector 开发镜像 2.1.1 版本及以上。
 
 ### 版本发布时间