From de424ca27a5d2cd5f270d91ce38ef432847385a1 Mon Sep 17 00:00:00 2001 From: chendexi Date: Tue, 23 Jul 2024 08:17:47 +0000 Subject: [PATCH] Support adding self-signed root certificates Signed-off-by: chendexi --- Dockerfile | 2 ++ certs/.gitkeep | 0 docs/changelog-compared-with-upstream.md | 2 ++ 3 files changed, 4 insertions(+) create mode 100644 certs/.gitkeep diff --git a/Dockerfile b/Dockerfile index 6bd0ee3b..620db5aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,8 @@ RUN rm -rfv /usr/lib/coreos-assembler /usr/bin/coreos-assembler COPY ./src/print-dependencies.sh ./src/deps*.txt ./src/vmdeps*.txt ./src/build-deps.txt /root/containerbuild/src/ COPY ./build.sh /root/containerbuild/ +COPY ./certs /etc/pki/ca-trust/source/anchors/ +RUN /usr/bin/update-ca-trust RUN ./build.sh configure_yum_repos RUN ./build.sh install_rpms diff --git a/certs/.gitkeep b/certs/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/docs/changelog-compared-with-upstream.md b/docs/changelog-compared-with-upstream.md index 7dea2d7d..3380e9a0 100644 --- a/docs/changelog-compared-with-upstream.md +++ b/docs/changelog-compared-with-upstream.md @@ -54,6 +54,7 @@ #### 修复以tcg方式构建live镜像失败问题 #### 屏蔽不支持的kola选项 #### 暂不支持以osbuild方式构建磁盘镜像 +#### 支持添加自签名根证书 ## 目录结构变化 @@ -61,5 +62,6 @@ ### 移除与上游CICD相关代码目录及构建内容： - ci/ - continuous/ +### 添加certs目录存放构建所需的自签名根证书 ### 修改和新增部分文档说明 -- Gitee