rebase: rebase inner patches

Signed-off-by: Xynnn007 <[email protected]>

.dockerignore

@@ -1 +1,3 @@
-target
+target
+Dockerfile.aa
+Dockerfile.cdh

APPLICATION/attestation-agent/buildspec.yml

@@ -0,0 +1,36 @@
+name: &NAME
+version: &VERSION
+image_type: &IMAGE_TYPE
+baseos_version: &BASEOS_VERSION
+
+# 定义镜像仓库信息
+repository_info:
+  acr: &ACR_PROD confidential-ai-registry.cn-shanghai.cr.aliyuncs.com/product/attestation-agent
+
+# 定义镜像测试信息
+t-one:
+  # 配置测试信息 workspace 和模版
+  workspace: &WORKSPACE anolis
+  project: &PROJECT default_anolis
+  test_suite: &TEST_SUITE image-ci-test
+  # 执行测试 case, 多个用数组表示
+  test_conf: &TEST_CONF baseos_container
+  test_case: &TEST_CASE baseos_container_default
+  cloud_server_tag: &CLOUD_SERVER_TAG [alinux-image-ci-x86-ecs]
+
+# 构建镜像配置
+images:
+  # 分组名称，支持自定义
+  Attestation-Agent:
+    build: true
+    test: false
+    region: cn-hongkong
+    platform: [linux/amd64]
+    docker_file:
+      path: Dockerfile.aa
+      scene:
+        args: []
+        tags: [[0.0.2, latest]]
+        registry: [*ACR_PROD]
+      # 测试配置
+      test_config: [*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], '']

APPLICATION/attestation-agent/version.yml

@@ -0,0 +1,13 @@
+# 版本关系依赖表，默认继承 version-base.yml 配置，可重写覆盖
+BaseDependency: ../version-base.yml
+Dependency:
+  name: trustiflux
+  image_type: application
+  versions:
+    1.0.1:
+      # 对 AI 框架版本对 python 版本的要求
+      python_version: []
+      # gpu 对 cuda 版本的要求
+      cuda_version: []
+      # 对 baseos 的要求，*AnolisOS8.6 表示 Anolis8.6
+      baseos_version: [*Alinux3.2304]

APPLICATION/ci-image/buildspec.yml

@@ -0,0 +1,36 @@
+name: &NAME
+version: &VERSION
+image_type: &IMAGE_TYPE
+baseos_version: &BASEOS_VERSION
+
+# 定义镜像仓库信息
+repository_info:
+  acr: &ACR_PROD confidential-ai-registry.cn-shanghai.cr.aliyuncs.com/dev/guest-components-ci
+
+# 定义镜像测试信息
+t-one:
+  # 配置测试信息 workspace 和模版
+  workspace: &WORKSPACE anolis
+  project: &PROJECT default_anolis
+  test_suite: &TEST_SUITE image-ci-test
+  # 执行测试 case, 多个用数组表示
+  test_conf: &TEST_CONF baseos_container
+  test_case: &TEST_CASE baseos_container_default
+  cloud_server_tag: &CLOUD_SERVER_TAG [alinux-image-ci-x86-ecs]
+
+# 构建镜像配置
+images:
+  # 分组名称，支持自定义
+  CI-image:
+    build: true
+    test: false
+    region: cn-hongkong
+    platform: [linux/amd64]
+    docker_file:
+      path: Dockerfile.ci
+      scene:
+        args: []
+        tags: [[0.0.2, latest]]
+        registry: [*ACR_PROD]
+      # 测试配置
+      test_config: [*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], '']

APPLICATION/ci-image/version.yml

@@ -0,0 +1,13 @@
+# 版本关系依赖表，默认继承 version-base.yml 配置，可重写覆盖
+BaseDependency: ../version-base.yml
+Dependency:
+  name: trustiflux
+  image_type: application
+  versions:
+    1.0.1:
+      # 对 AI 框架版本对 python 版本的要求
+      python_version: []
+      # gpu 对 cuda 版本的要求
+      cuda_version: []
+      # 对 baseos 的要求，*AnolisOS8.6 表示 Anolis8.6
+      baseos_version: [*Alinux3.2304]

APPLICATION/confidential-data-hub/buildspec.yml

@@ -0,0 +1,36 @@
+name: &NAME
+version: &VERSION
+image_type: &IMAGE_TYPE
+baseos_version: &BASEOS_VERSION
+
+# 定义镜像仓库信息
+repository_info:
+  acr: &ACR_PROD confidential-ai-registry.cn-shanghai.cr.aliyuncs.com/product/confidential-data-hub
+
+# 定义镜像测试信息
+t-one:
+  # 配置测试信息 workspace 和模版
+  workspace: &WORKSPACE anolis
+  project: &PROJECT default_anolis
+  test_suite: &TEST_SUITE image-ci-test
+  # 执行测试 case, 多个用数组表示
+  test_conf: &TEST_CONF baseos_container
+  test_case: &TEST_CASE baseos_container_default
+  cloud_server_tag: &CLOUD_SERVER_TAG [alinux-image-ci-x86-ecs]
+
+# 构建镜像配置
+images:
+  # 分组名称，支持自定义
+  Confidential-Data-Hub:
+    build: true
+    test: false
+    region: cn-hongkong
+    platform: [linux/amd64]
+    docker_file:
+      path: Dockerfile.cdh
+      scene:
+        args: []
+        tags: [[0.0.1, latest]]
+        registry: [*ACR_PROD]
+      # 测试配置
+      test_config: [*WORKSPACE, *PROJECT, *TEST_SUITE, *TEST_CONF, *TEST_CASE, *CLOUD_SERVER_TAG[0], '']

APPLICATION/confidential-data-hub/version.yml

@@ -0,0 +1,13 @@
+# 版本关系依赖表，默认继承 version-base.yml 配置，可重写覆盖
+BaseDependency: ../version-base.yml
+Dependency:
+  name: trustiflux
+  image_type: application
+  versions:
+    1.0.1:
+      # 对 AI 框架版本对 python 版本的要求
+      python_version: []
+      # gpu 对 cuda 版本的要求
+      cuda_version: []
+      # 对 baseos 的要求，*AnolisOS8.6 表示 Anolis8.6
+      baseos_version: [*Alinux3.2304]

Cargo.toml

@@ -34,8 +34,10 @@ ctr = "0.9.2"
 env_logger = "0.11.6"
 hex = "0.4.3"
 hmac = "0.12.1"
-jwt-simple = { version = "0.12", default-features = false, features = ["pure-rust"] }
-kbs-types = "0.7.0"
+jwt-simple = { version = "0.12", default-features = false, features = [
+    "pure-rust",
+] }
+kbs-types = { git = "https://github.com/inclavare-containers/kbs-types.git", rev = "d881395" }
 lazy_static = "1.5.0"
 log = "0.4.22"
 nix = "0.29"