bugfix: fix unsuitable filemode for isula-build(er)
Signed-off-by: DCCooper <1866858@gmail.com>
This commit is contained in:
parent
f5514e1d3e
commit
71c5e594ed
@ -1 +1 @@
|
|||||||
0.9.4-3
|
0.9.4-4
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
8ef723e794eead5d385ed014f743ad5147c7ac87
|
d603403d4e1ccc132f932b8e3e4d0a3d9898303b
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: isula-build
|
Name: isula-build
|
||||||
Version: 0.9.4
|
Version: 0.9.4
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: A tool to build container images
|
Summary: A tool to build container images
|
||||||
License: Mulan PSL V2
|
License: Mulan PSL V2
|
||||||
URL: https://gitee.com/openeuler/isula-build
|
URL: https://gitee.com/openeuler/isula-build
|
||||||
@ -41,8 +41,8 @@ sh ./apply-patches
|
|||||||
%install
|
%install
|
||||||
install -d %{buildroot}%{_bindir}
|
install -d %{buildroot}%{_bindir}
|
||||||
# install binary
|
# install binary
|
||||||
install -p -m 555 ./bin/isula-build %{buildroot}%{_bindir}/isula-build
|
install -p -m 551 ./bin/isula-build %{buildroot}%{_bindir}/isula-build
|
||||||
install -p -m 555 ./bin/isula-builder %{buildroot}%{_bindir}/isula-builder
|
install -p -m 550 ./bin/isula-builder %{buildroot}%{_bindir}/isula-builder
|
||||||
# install service
|
# install service
|
||||||
%if 0%{?is_systemd}
|
%if 0%{?is_systemd}
|
||||||
install -d %{buildroot}%{_unitdir}
|
install -d %{buildroot}%{_unitdir}
|
||||||
@ -72,8 +72,8 @@ fi
|
|||||||
%if 0%{?is_systemd}
|
%if 0%{?is_systemd}
|
||||||
%config(noreplace) %attr(0640,root,root) %{_unitdir}/isula-build.service
|
%config(noreplace) %attr(0640,root,root) %{_unitdir}/isula-build.service
|
||||||
%endif
|
%endif
|
||||||
%attr(555,root,root) %{_bindir}/isula-build
|
%attr(551,root,root) %{_bindir}/isula-build
|
||||||
%attr(555,root,root) %{_bindir}/isula-builder
|
%attr(550,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/configuration.toml
|
||||||
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isula-build/storage.toml
|
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isula-build/storage.toml
|
||||||
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isula-build/registries.toml
|
%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isula-build/registries.toml
|
||||||
@ -81,6 +81,9 @@ fi
|
|||||||
/usr/share/bash-completion/completions/isula-build
|
/usr/share/bash-completion/completions/isula-build
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 17 2020 lixiang <lixiang172@huawei.com> - 0.9.4-4
|
||||||
|
- Fix unsuitable filemode for isula-build(er)
|
||||||
|
|
||||||
* Thu Nov 12 2020 lixiang <lixiang172@huawei.com> - 0.9.4-3
|
* Thu Nov 12 2020 lixiang <lixiang172@huawei.com> - 0.9.4-3
|
||||||
- Chown config root path before daemon started
|
- Chown config root path before daemon started
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,28 @@
|
|||||||
|
From 06e8b4cf47eea4edfad8e9d37c094121d033d579 Mon Sep 17 00:00:00 2001
|
||||||
|
From: DCCooper <1866858@gmail.com>
|
||||||
|
Date: Tue, 17 Nov 2020 15:06:06 +0800
|
||||||
|
Subject: [PATCH] bugfix: fix unsuitable filemode for isula-build(er)
|
||||||
|
|
||||||
|
Signed-off-by: DCCooper <1866858@gmail.com>
|
||||||
|
---
|
||||||
|
Makefile | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index f4c95e35..11166cc2 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -95,8 +95,8 @@ proto:
|
||||||
|
|
||||||
|
.PHONY: install
|
||||||
|
install:
|
||||||
|
- install -D -m0555 bin/isula-build $(BINDIR)
|
||||||
|
- install -D -m0555 bin/isula-builder $(BINDIR)
|
||||||
|
+ install -D -m0551 bin/isula-build $(BINDIR)
|
||||||
|
+ install -D -m0550 bin/isula-builder $(BINDIR)
|
||||||
|
@[ ! -d ${CONFIG_DIR}/${CONFIG_FILE} ] && install -dm0640 ${CONFIG_DIR}
|
||||||
|
@( [ -f ${CONFIG_DIR}/${CONFIG_FILE} ] && printf "%-20s %s\n" "${CONFIG_FILE}" "already exist in ${CONFIG_DIR}, please replace it manually." ) || install -D -m0600 ${LOCAL_CONF_PREFIX}/${CONFIG_FILE} ${CONFIG_DIR}/${CONFIG_FILE}
|
||||||
|
@( [ -f ${CONFIG_DIR}/${POLICY_FILE} ] && printf "%-20s %s\n" "${POLICY_FILE}" "already exist in ${CONFIG_DIR}, please replace it manually." ) || install -D -m0600 ${LOCAL_CONF_PREFIX}/${POLICY_FILE} ${CONFIG_DIR}/${POLICY_FILE}
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|
||||||
@ -10,3 +10,4 @@ patch/0037-isula-build-fix-goroutine-leak-problem.patch
|
|||||||
#patch/0041-isula-build-add-t-shortname-for-tag-and-remove-it-fr.patch
|
#patch/0041-isula-build-add-t-shortname-for-tag-and-remove-it-fr.patch
|
||||||
patch/0065-fix-panic-when-user-knock-ctrl-c-when-pull-push-and-.patch
|
patch/0065-fix-panic-when-user-knock-ctrl-c-when-pull-push-and-.patch
|
||||||
patch/0066-bugfix-chown-config-root-path-before-daemon-started.patch
|
patch/0066-bugfix-chown-config-root-path-before-daemon-started.patch
|
||||||
|
patch/0067-bugfix-fix-unsuitable-filemode-for-isula-build-er.patch
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user