From 8e7adf10cebda91d015b44f1a9aa5f0c6bb6e7ab Mon Sep 17 00:00:00 2001 From: wangzhe Date: Mon, 14 Apr 2025 10:28:26 +0800 Subject: [PATCH] Add Anolis 8.10 docker config Signed-off-by: wangzhe --- BASE/anolisos/8.10/Dockerfile | 13 +++++++++++++ BASE/anolisos/8.10/ci.yaml | 20 ++++++++++++++++++++ BASE/anolisos/8.10/download.sh | 4 ++++ BASE/anolisos/buildspec.yml | 4 ++-- BASE/anolisos/version.yml | 4 ++-- version-base.yml | 1 + 6 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 BASE/anolisos/8.10/Dockerfile create mode 100644 BASE/anolisos/8.10/ci.yaml create mode 100644 BASE/anolisos/8.10/download.sh diff --git a/BASE/anolisos/8.10/Dockerfile b/BASE/anolisos/8.10/Dockerfile new file mode 100644 index 0000000..bf687ba --- /dev/null +++ b/BASE/anolisos/8.10/Dockerfile @@ -0,0 +1,13 @@ +FROM scratch +LABEL \ + org.opencontainers.image.title="Anolis OS Base Image" \ + org.opencontainers.image.vendor="Anolis OS 8.10" \ + org.opencontainers.image.licenses="Mulan PSL v2" \ + org.opencontainers.image.created="2024-04-10" \ + maintainer="OpenAnolis Cloud Native SIG" +ARG TARGETARCH +ADD AnolisOS8.10-base-$TARGETARCH-20240410.tar / +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo Asia/Shanghai > /etc/timezone +ENV TZ=Asia/Shanghai + +CMD ["/bin/bash"] diff --git a/BASE/anolisos/8.10/ci.yaml b/BASE/anolisos/8.10/ci.yaml new file mode 100644 index 0000000..3f268c2 --- /dev/null +++ b/BASE/anolisos/8.10/ci.yaml @@ -0,0 +1,20 @@ +repo: + git_url: https://gitee.com/anolis/docker-images + trigger_mode: pr +test: + docker_build: + test_type: docker + docker_base_test: + tone_test: base_test + base_test: + tone_workspace: container_ci_test + tone_project: default_container_ci_test + tone_test_suite: image-ci-test + tone_test_conf: group=container_startup_test + tone_test_case: baseos_container + server_config: + x86_64: anolis-container-func-test-x86 + aarch64: anolis-container-func-test-arm64 + parallel: + - docker_build + - docker_base_test diff --git a/BASE/anolisos/8.10/download.sh b/BASE/anolisos/8.10/download.sh new file mode 100644 index 0000000..6a0f6e1 --- /dev/null +++ b/BASE/anolisos/8.10/download.sh @@ -0,0 +1,4 @@ +#! /bin/bash + +wget https://cr-images-pub.oss-cn-hangzhou.aliyuncs.com/root/base/AnolisOS8.10-base-amd64-20240410.tar +wget https://cr-images-pub.oss-cn-hangzhou.aliyuncs.com/root/base/AnolisOS8.10-base-arm64-20240410.tar \ No newline at end of file diff --git a/BASE/anolisos/buildspec.yml b/BASE/anolisos/buildspec.yml index 2b9bc0b..d53c695 100644 --- a/BASE/anolisos/buildspec.yml +++ b/BASE/anolisos/buildspec.yml @@ -26,10 +26,10 @@ images: # 定义是否构建参数 build: true docker_file: - path: BASE/anolisos/8.9/Dockerfile + path: BASE/anolisos/8.10/Dockerfile scene: args: [] - tags: [8.9] + tags: ["8.10"] registry: [*ACR_PROD] # 测试配置 test_config: [*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], ''] diff --git a/BASE/anolisos/version.yml b/BASE/anolisos/version.yml index 9264169..373217e 100644 --- a/BASE/anolisos/version.yml +++ b/BASE/anolisos/version.yml @@ -4,7 +4,7 @@ Dependency: name: anolisos image_type: base versions: - 8.9: - baseos_version: *AnolisOS8.9 + 8.10: + baseos_version: *AnolisOS8.10 23.2: baseos_version: *AnolisOS23.2 diff --git a/version-base.yml b/version-base.yml index 8949f81..8f29a6f 100644 --- a/version-base.yml +++ b/version-base.yml @@ -5,6 +5,7 @@ Dependency: 8.6: &AnolisOS8.6 [anolisos, 8.6, openanolis/anolisos:8.6] 8.8: &AnolisOS8.8 [anolisos, 8.8, openanolis/anolisos:8.8] 8.9: &AnolisOS8.9 [anolisos, 8.9, openanolis/anolisos:8.9] + 8.10: &AnolisOS8.10 [anolisos, 8.10, openanolis/anolisos:8.10] Anolis23: 23: &AnolisOS23 [anolisos, 23, openanolis/anolisos:23] 23.1: &AnolisOS23.1 [anolisos, 23.1, openanolis/anolisos:23.1] -- Gitee