diff --git a/VERSION-openeuler b/VERSION-openeuler index 40fc689..826019f 100644 --- a/VERSION-openeuler +++ b/VERSION-openeuler @@ -1 +1 @@ -0.9.3-2 +0.9.4-1 diff --git a/git-commit b/git-commit index 8ade3c1..9c0906c 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -0f7339c3932370ff275a870b0959f25e870750fb +9f2eac8f0045f78872350da89a871f9c6d609a24 diff --git a/isula-build.spec b/isula-build.spec index 1ece90c..4014f13 100644 --- a/isula-build.spec +++ b/isula-build.spec @@ -1,8 +1,8 @@ %global is_systemd 1 Name: isula-build -Version: 0.9.3 -Release: 2 +Version: 0.9.4 +Release: 1 Summary: A tool to build container images License: Mulan PSL V2 URL: https://gitee.com/openeuler/isula-build @@ -41,15 +41,15 @@ sh ./apply-patches %install install -d %{buildroot}%{_bindir} # install binary -install -p -m 550 ./bin/isula-build %{buildroot}%{_bindir}/isula-build -install -p -m 550 ./bin/isula-builder %{buildroot}%{_bindir}/isula-builder +install -p -m 555 ./bin/isula-build %{buildroot}%{_bindir}/isula-build +install -p -m 555 ./bin/isula-builder %{buildroot}%{_bindir}/isula-builder # install service %if 0%{?is_systemd} install -d %{buildroot}%{_unitdir} install -p -m 640 isula-build.service %{buildroot}%{_unitdir}/isula-build.service %endif # install config file -install -d %{buildroot}%{_sysconfdir}/isula-build +install -d -m 750 %{buildroot}%{_sysconfdir}/isula-build install -p -m 600 ./cmd/daemon/config/configuration.toml %{buildroot}%{_sysconfdir}/isula-build/configuration.toml install -p -m 600 ./cmd/daemon/config/storage.toml %{buildroot}%{_sysconfdir}/isula-build/storage.toml install -p -m 600 ./cmd/daemon/config/registries.toml %{buildroot}%{_sysconfdir}/isula-build/registries.toml @@ -61,14 +61,19 @@ install -p -m 600 __isula-build %{buildroot}/usr/share/bash-completion/completio %clean rm -rf %{buildroot} +%post +if ! getent group isula > /dev/null; then + groupadd --system isula +fi + %files # default perm for files and folder %defattr(0640,root,root,0550) %if 0%{?is_systemd} %config(noreplace) %attr(0640,root,root) %{_unitdir}/isula-build.service %endif -%attr(550,root,root) %{_bindir}/isula-build -%attr(550,root,root) %{_bindir}/isula-builder +%attr(555,root,root) %{_bindir}/isula-build +%attr(555,root,root) %{_bindir}/isula-builder %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isula-build/configuration.toml %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isula-build/storage.toml %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isula-build/registries.toml @@ -76,6 +81,9 @@ rm -rf %{buildroot} /usr/share/bash-completion/completions/isula-build %changelog +* Fri Nov 06 2020 lixiang - 0.9.4-1 +- Bump version to 0.9.4 + * Thu Sep 10 2020 lixiang - 0.9.3-2 - Sync patch from upstream diff --git a/series.conf b/series.conf index 64830f1..1c07d07 100644 --- a/series.conf +++ b/series.conf @@ -1,10 +1,10 @@ patch/0013-vendor-change-auth.json-file-mode-from-0700-to-0600.patch -patch/0014-store-recover-use-graphLock-when-mount-a-layer.patch -patch/0027-fix-goroutine-leak-with-close-tarLogger-in-a-defer-c.patch +#patch/0014-store-recover-use-graphLock-when-mount-a-layer.patch +#patch/0027-fix-goroutine-leak-with-close-tarLogger-in-a-defer-c.patch patch/0030-xattr-support-ima-and-evm.patch patch/0033-isula-build-remove-docker-releated-path-for-authenti.patch patch/0037-isula-build-fix-goroutine-leak-problem.patch -patch/0038-parse-all-stages-and-mark-it-wheather-need-to-commit.patch -patch/0039-bugfix-fix-build-hang-problem-when-error-happened-be.patch -patch/0040-isula-build-change-default-healthcheck-timeout-to-20.patch -patch/0041-isula-build-add-t-shortname-for-tag-and-remove-it-fr.patch +#patch/0038-parse-all-stages-and-mark-it-wheather-need-to-commit.patch +#patch/0039-bugfix-fix-build-hang-problem-when-error-happened-be.patch +#patch/0040-isula-build-change-default-healthcheck-timeout-to-20.patch +#patch/0041-isula-build-add-t-shortname-for-tag-and-remove-it-fr.patch diff --git a/v0.9.3.tar.gz b/v0.9.3.tar.gz deleted file mode 100644 index 1a78e52..0000000 Binary files a/v0.9.3.tar.gz and /dev/null differ diff --git a/v0.9.4.tar.gz b/v0.9.4.tar.gz new file mode 100644 index 0000000..8234349 Binary files /dev/null and b/v0.9.4.tar.gz differ