From 7cea342c48f23f18f470b9fb7869950090fd85bc Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Mon, 15 Jan 2024 15:20:57 +0800 Subject: [PATCH] Add anolisos 8.8 config file --- BASE/anolisos/8.8/Dockerfile | 14 ++++++++++++++ BASE/anolisos/8.8/ci.yaml | 20 ++++++++++++++++++++ BASE/anolisos/8.8/download.sh | 5 +++++ BASE/anolisos/buildspec.yml | 22 +++++++++++++--------- BASE/anolisos/version.yml | 10 ++++++++-- 5 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 BASE/anolisos/8.8/Dockerfile create mode 100644 BASE/anolisos/8.8/ci.yaml create mode 100644 BASE/anolisos/8.8/download.sh diff --git a/BASE/anolisos/8.8/Dockerfile b/BASE/anolisos/8.8/Dockerfile new file mode 100644 index 0000000..cb6092a --- /dev/null +++ b/BASE/anolisos/8.8/Dockerfile @@ -0,0 +1,14 @@ +FROM registry.openanolis.cn/openanolis/anolisos:8.8 +LABEL \ + org.opencontainers.image.title="Anolis OS 8 Base Image" \ + org.opencontainers.image.vendor="Anolis OS 8.8" \ + org.opencontainers.image.licenses="Mulan PSL v2" \ + org.opencontainers.image.created="2024-01-15" \ + maintainer="OpenAnolis Cloud Native SIG" + +RUN yum update -y && \ + yum clean all +RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime + + +CMD ["/bin/bash"] diff --git a/BASE/anolisos/8.8/ci.yaml b/BASE/anolisos/8.8/ci.yaml new file mode 100644 index 0000000..3f268c2 --- /dev/null +++ b/BASE/anolisos/8.8/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.8/download.sh b/BASE/anolisos/8.8/download.sh new file mode 100644 index 0000000..743765c --- /dev/null +++ b/BASE/anolisos/8.8/download.sh @@ -0,0 +1,5 @@ +#! /bin/bash + +# wget latest tar +# Anolis OS 8.8 have previous docker image.From the image and update packages. +echo 0 diff --git a/BASE/anolisos/buildspec.yml b/BASE/anolisos/buildspec.yml index 57b37c9..25455ed 100644 --- a/BASE/anolisos/buildspec.yml +++ b/BASE/anolisos/buildspec.yml @@ -5,15 +5,19 @@ baseos_version: &BASEOS_VERSION # 定义镜像仓库信息 repository_info: - dockerhub: &DOCKERHUB_PROD - acr: &ACR_PROD + acr: &AnolisOS anolis-registry.cn-zhangjiakou.cr.aliyuncs.com/openanolis/ # 定义镜像测试信息 t-one: # 配置测试信息 workspace 和模版 - workspace: &WORKSPACE - template: &TEMPLATE - + workspace: &WORKSPACE container_ci_test + project: &PROJECT default_container_ci_test + test_suite: &TEST_SUITE image-ci-test + # template: &TEMPLATE alinux3_baseos_container + test_conf: &TEST_CONF group=baseos_container + test_case: &TEST_CASE anolis8_baseos_container + cloud_server_tag: &CLOUD_SERVER_TAG [anolis-container-ci-x86] + # 构建镜像配置 images: # 分组名称,支持自定义 @@ -21,10 +25,10 @@ images: # 定义是否构建参数 build: true docker_file: - path: BASE/anolisos/8.6/Dockerfile + path: BASE/anolisos/8.8/Dockerfile scene: args: [] - tags: [] - registry: [] + tags: [[8.8-240115, 8, 8.8, latest]] + registry: [ *AnolisOS ] # 测试配置 - test_config: [*WORKSPACE, *TEMPLATE] \ No newline at end of file + 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 b8a2e27..e173c51 100644 --- a/BASE/anolisos/version.yml +++ b/BASE/anolisos/version.yml @@ -4,5 +4,11 @@ Dependency: name: anolisos image_type: base versions: - v1.0: - baseos_version: *AnolisOS8.6 + 8.8-240115: + baseos_version: *AnolisOS8.8 + 8: + baseos_version: *AnolisOS8.8 + 8.8: + baseos_version: *AnolisOS8.8 + latest: + baseos_version: *AnolisOS8.8 -- Gitee