From c9a48f58c73085c8c8b4f31ce54326fd42b0c711 Mon Sep 17 00:00:00 2001 From: DCCooper <1866858@gmail.com> Date: Mon, 26 Jul 2021 19:08:08 +0800 Subject: [PATCH] isula-build: update documents about file mode Signed-off-by: DCCooper <1866858@gmail.com> --- VERSION-openeuler | 2 +- git-commit | 2 +- isula-build.spec | 8 ++- ...ild-update-documents-about-file-mode.patch | 58 +++++++++++++++++++ series.conf | 1 + 5 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 patch/0056-isula-build-update-documents-about-file-mode.patch diff --git a/VERSION-openeuler b/VERSION-openeuler index a2edf51..6bcb53c 100644 --- a/VERSION-openeuler +++ b/VERSION-openeuler @@ -1 +1 @@ -0.9.5-9 +0.9.5-10 diff --git a/git-commit b/git-commit index b02fc9f..88134bc 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -2c805b03e8628304bc116ed885941d6ecc89cd44 +25d21686be52b8801d9988c7a4d13aec1a4965f4 diff --git a/isula-build.spec b/isula-build.spec index 890d713..a5942d8 100644 --- a/isula-build.spec +++ b/isula-build.spec @@ -2,7 +2,7 @@ Name: isula-build Version: 0.9.5 -Release: 9 +Release: 10 Summary: A tool to build container images License: Mulan PSL V2 URL: https://gitee.com/openeuler/isula-build @@ -85,6 +85,12 @@ fi /usr/share/bash-completion/completions/isula-build %changelog +* Mon Jul 26 2021 DCCooper <1866858@gmail.com> - 0.9.5-10 +- Type:bugfix +- CVE:NA +- SUG:restart +- DESC:update documents about file mode + * Mon Jul 26 2021 DCCooper <1866858@gmail.com> - 0.9.5-9 - Type:bugfix - CVE:NA diff --git a/patch/0056-isula-build-update-documents-about-file-mode.patch b/patch/0056-isula-build-update-documents-about-file-mode.patch new file mode 100644 index 0000000..1ab181f --- /dev/null +++ b/patch/0056-isula-build-update-documents-about-file-mode.patch @@ -0,0 +1,58 @@ +From e024b5b7ddabca7f7ff0cebd05366146df9832ab Mon Sep 17 00:00:00 2001 +From: DCCooper <1866858@gmail.com> +Date: Mon, 26 Jul 2021 19:04:49 +0800 +Subject: [PATCH] isula-build: update documents about file mode + +Signed-off-by: DCCooper <1866858@gmail.com> +--- + doc/manual_en.md | 4 ++-- + doc/manual_zh.md | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/doc/manual_en.md b/doc/manual_en.md +index c23b306..3064c17 100644 +--- a/doc/manual_en.md ++++ b/doc/manual_en.md +@@ -1070,7 +1070,7 @@ The isula-build component processes communicate with each other through the Unix + + | **File Path** | **File/Folder Permission** | **Description** | + | ------------------------------------------- | ------------------- | ------------------------------------------------------------ | +-| /usr/bin/isula-build | 551 | Binary file of the command line tool. | ++| /usr/bin/isula-build | 550 | Binary file of the command line tool. | + | /usr/bin/isula-builder | 550 | Binary file of the isula-builder process on the server. | + | /usr/lib/systemd/system/isula-build.service | 640 | systemd configuration file, which is used to manage the isula-build service. | + | /usr/isula-build | 650 | Root directory of the isula-builder configuration file. | +@@ -1078,7 +1078,7 @@ The isula-build component processes communicate with each other through the Unix + | /etc/isula-build/policy.json | 600 | Syntax file of the signature verification policy file. | + | /etc/isula-build/registries.toml | 600 | Configuration file of each image repository, including the available image repository list and image repository blacklist. | + | /etc/isula-build/storage.toml | 600 | Configuration file for local persistent storage, including the configuration of the used storage driver. | +-| /etc/isula-build/isula-build.pub | 444 | Asymmetric encryption public key file. | ++| /etc/isula-build/isula-build.pub | 400 | Asymmetric encryption public key file. | + | /var/run/isula_build.sock | 660 | Local socket of isula-builder. | + | /var/lib/isula-build | 700 | Local persistency directory. | + | /var/run/isula-build | 700 | Local runtime directory. | +diff --git a/doc/manual_zh.md b/doc/manual_zh.md +index c0234f1..8104305 100644 +--- a/doc/manual_zh.md ++++ b/doc/manual_zh.md +@@ -1060,7 +1060,7 @@ isula-build两个组件进程之间通过unix socket套接字文件进行通信 + + | **文件路径** | **文件/文件夹权限** | **说明** | + | ------------------------------------------- | ------------------- | ------------------------------------------------------------ | +-| /usr/bin/isula-build | 551 | 命令行工具二进制文件。 | ++| /usr/bin/isula-build | 550 | 命令行工具二进制文件。 | + | /usr/bin/isula-builder | 550 | 服务端isula-builder进程二进制文件。 | + | /usr/lib/systemd/system/isula-build.service | 640 | systemd配置文件，用于管理isula-build服务。 | + | /etc/isula-build | 650 | isula-builder 配置文件根目录 | +@@ -1068,7 +1068,7 @@ isula-build两个组件进程之间通过unix socket套接字文件进行通信 + | /etc/isula-build/policy.json | 600 | 签名验证策略文件的语法文件。 | + | /etc/isula-build/registries.toml | 600 | 针对各个镜像仓库的配置文件，含可用的镜像仓库列表、镜像仓库黑名单。 | + | /etc/isula-build/storage.toml | 600 | 本地持久化存储的配置文件，包含所使用的存储驱动的配置。 | +-| /etc/isula-build/isula-build.pub | 444 | 非对称加密公钥文件 | ++| /etc/isula-build/isula-build.pub | 400 | 非对称加密公钥文件 | + | /var/run/isula_build.sock | 660 | 服务端isula-builder的本地套接字。 | + | /var/lib/isula-build | 700 | 本地持久化目录。 | + | /var/run/isula-build | 700 | 本地运行时目录。 | +-- +1.8.3.1 + diff --git a/series.conf b/series.conf index 7baf6fd..24b5361 100644 --- a/series.conf +++ b/series.conf @@ -19,3 +19,4 @@ patch/0052-hack-make-isula-build-binary-static.patch patch/0053-integration-test-from-new-flaw-of-run-and-data-root-.patch patch/0054-isula-build-cleancode-for-errors.Wrap-function.patch patch/0055-isula-build-change-isula-build-file-mode.patch +patch/0056-isula-build-update-documents-about-file-mode.patch