diff --git a/BASE/anolisos/23.2/Dockerfile b/BASE/anolisos/23.2/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..25914538ff2a3fe2834c40e65c74aefc7f2026a4 --- /dev/null +++ b/BASE/anolisos/23.2/Dockerfile @@ -0,0 +1,13 @@ +FROM scratch +LABEL \ + org.opencontainers.image.title="Anolis OS Base Image" \ + org.opencontainers.image.vendor="Anolis OS 23.2" \ + org.opencontainers.image.licenses="Mulan PSL v2" \ + org.opencontainers.image.created="2024-12-23" \ + maintainer="OpenAnolis Cloud Native SIG" +ARG TARGETARCH +ADD AnolisOS-23.2-rc2-docker-$TARGETARCH.tar / +RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime && echo Asia/Shanghai > /etc/timezone +ENV TZ=Asia/Shanghai + +CMD ["/bin/bash"] diff --git a/BASE/anolisos/23.2/ci.yaml b/BASE/anolisos/23.2/ci.yaml new file mode 100644 index 0000000000000000000000000000000000000000..3f268c2f845f85eb1cd546e2697f14b596cc7844 --- /dev/null +++ b/BASE/anolisos/23.2/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/23.2/download.sh b/BASE/anolisos/23.2/download.sh new file mode 100644 index 0000000000000000000000000000000000000000..99452ef6bb5e20fc25526eeb7951ef646961dfc8 --- /dev/null +++ b/BASE/anolisos/23.2/download.sh @@ -0,0 +1,4 @@ +#! /bin/bash + +wget https://cr-images-pub.oss-cn-hangzhou.aliyuncs.com/root/base/AnolisOS-23.2-rc2-docker-arm64.tar +wget https://cr-images-pub.oss-cn-hangzhou.aliyuncs.com/root/base/AnolisOS-23.2-rc2-docker-amd64.tar diff --git a/BASE/anolisos/buildspec.yml b/BASE/anolisos/buildspec.yml index f7356ba6980c357c28781ae77361b4bd65105e15..2b9bc0bc6a5add6ff5760e6e37b0fe564be8ecb2 100644 --- a/BASE/anolisos/buildspec.yml +++ b/BASE/anolisos/buildspec.yml @@ -37,10 +37,10 @@ images: # 定义是否构建参数 build: true docker_file: - path: BASE/anolisos/23.1/Dockerfile + path: BASE/anolisos/23.2/Dockerfile scene: args: [] - tags: [23.1] + tags: [23.2] 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 31097bb5506c372a3c08ac607bb6cac4061fa391..9264169457ffc5d1364a28ff945a7aac889b6b64 100644 --- a/BASE/anolisos/version.yml +++ b/BASE/anolisos/version.yml @@ -6,5 +6,5 @@ Dependency: versions: 8.9: baseos_version: *AnolisOS8.9 - 23.1: - baseos_version: *AnolisOS23.1 + 23.2: + baseos_version: *AnolisOS23.2 diff --git a/version-base.yml b/version-base.yml index a9af855172799f41ddbffe41b39b32b3554ffb02..8949f81fc6acd4387ac68577dbac29432ce1d18f 100644 --- a/version-base.yml +++ b/version-base.yml @@ -8,5 +8,6 @@ Dependency: Anolis23: 23: &AnolisOS23 [anolisos, 23, openanolis/anolisos:23] 23.1: &AnolisOS23.1 [anolisos, 23.1, openanolis/anolisos:23.1] + 23.2: &AnolisOS23.2 [anolisos, 23.2, openanolis/anolisos:23.2] Alinux: 3: &Alinux3 [ alinux, 3, alibaba-cloud-linux-3-registry.cn-hangzhou.cr.aliyuncs.com/alinux3/alinux3 ]