2020-12-30 16:00:53 +08:00
|
|
|
%global _version 2.0.8
|
2021-05-18 14:48:15 +08:00
|
|
|
%global _release 20210518.144540.git5288ed92
|
2019-09-30 10:53:41 -04:00
|
|
|
%global is_systemd 1
|
|
|
|
|
|
|
|
|
|
Name: iSulad
|
|
|
|
|
Version: %{_version}
|
2019-11-06 19:33:20 +08:00
|
|
|
Release: %{_release}
|
2019-09-30 10:53:41 -04:00
|
|
|
Summary: Lightweight Container Runtime Daemon
|
2020-04-27 09:43:55 +08:00
|
|
|
License: Mulan PSL v2
|
2020-09-03 18:51:47 +08:00
|
|
|
URL: https://gitee.com/openeuler/iSulad
|
|
|
|
|
Source: https://gitee.com/openeuler/iSulad/repository/archive/v%{version}.tar.gz
|
2019-11-06 19:33:20 +08:00
|
|
|
BuildRoot: {_tmppath}/iSulad-%{version}
|
|
|
|
|
ExclusiveArch: x86_64 aarch64
|
2019-09-30 10:53:41 -04:00
|
|
|
|
2021-02-02 15:33:40 +08:00
|
|
|
Patch1: 0001-make-thread-detach-to-avoid-resource-leak.patch
|
|
|
|
|
Patch2: 0002-devmapper-fix-udev-wait-thread-resource-leak.patch
|
|
|
|
|
Patch3: 0003-clean-code-fix-clean-code.patch
|
|
|
|
|
Patch4: 0004-judge-isula-load-file-exists.patch
|
|
|
|
|
Patch5: 0005-modify-image_load.sh-CI-to-test-file-not-exist.patch
|
|
|
|
|
Patch6: 0006-do-not-pause-container-when-copy.patch
|
|
|
|
|
Patch7: 0007-add-testcases-for-isula-cp.patch
|
|
|
|
|
Patch8: 0008-image_cb-rename-the-function-isula_-docker_-to-do_.patch
|
|
|
|
|
Patch9: 0009-fix-small-probability-of-coredump-in-CRI-streaming-s.patch
|
|
|
|
|
Patch10: 0010-fix-ramdom-coredump-if-pull-failed.patch
|
|
|
|
|
Patch11: 0011-shim-optimize-io-stream.patch
|
|
|
|
|
Patch12: 0012-add-CI-to-test-shim-io.patch
|
|
|
|
|
Patch13: 0013-CI-add-testcase-for-exec-without-pty.patch
|
|
|
|
|
Patch14: 0014-adapt-for-sparse-file-when-tar-file.patch
|
|
|
|
|
Patch15: 0015-driver-do-not-unlock-and-destroy-lock-when-clean-up.patch
|
|
|
|
|
Patch16: 0016-driver-do-not-set-g_graphdriver-to-NULL.patch
|
|
|
|
|
Patch17: 0017-ignore-error-if-get-ip-failed.patch
|
|
|
|
|
Patch18: 0018-GC-add-log-container-info-when-add-into-gc.patch
|
|
|
|
|
Patch19: 0019-log-use-the-same-function-to-init-log-in-export-paus.patch
|
|
|
|
|
Patch20: 0020-init-log-config-should-before-command-parse.patch
|
|
|
|
|
Patch21: 0021-spec-add-verify-for-device-cgroup-access-mode.patch
|
|
|
|
|
Patch22: 0022-log-change-log-level-from-warn-to-error.patch
|
|
|
|
|
Patch23: 0023-Fix-create-env-path-dir-if-dir-exist.patch
|
|
|
|
|
Patch24: 0024-iSulad-calculate-memusage-with-used-total_inactive_f.patch
|
|
|
|
|
Patch25: 0025-fix-container-exit-health-check-residue-and-multiple.patch
|
|
|
|
|
Patch26: 0026-CI-supplementary-testcase-for-health-check-monitor.patch
|
2021-03-23 09:50:40 +08:00
|
|
|
Patch27: 0027-add-container-lock-when-clean-container-resource.patch
|
|
|
|
|
Patch28: 0028-sleep-some-time-before-calculate-to-make-sure-fd-clo.patch
|
|
|
|
|
Patch29: 0029-stats-fix-wrong-memory-usage-info-in-stats.patch
|
|
|
|
|
Patch30: 0030-save-health-check-log-to-disk-before-unhealthy.patch
|
|
|
|
|
Patch31: 0031-unpack-try-to-remove-and-replace-dst_path-while-unpa.patch
|
|
|
|
|
Patch32: 0032-fd-leak-check-in-cp.sh-should-not-include-pull-fd-ch.patch
|
|
|
|
|
Patch33: 0033-devmapper-modify-log-msg.patch
|
|
|
|
|
Patch34: 0034-name_id_index-fix-restore-fail-to-remove-name-index.patch
|
|
|
|
|
Patch35: 0035-thread-function-calls-DAEMON_CLEAR_ERRORMSG-to-preve.patch
|
|
|
|
|
Patch36: 0036-modify-resume-task-name.patch
|
|
|
|
|
Patch37: 0037-cleadcode-Remove-extra-semicolons.patch
|
|
|
|
|
Patch38: 0038-restart-policy-add-support-unless-stopped-policy.patch
|
|
|
|
|
Patch39: 0039-CI-add-testcase-for-unless-stopped-restart-policy.patch
|
|
|
|
|
Patch40: 0040-bugfix-for-embedded-image.patch
|
|
|
|
|
Patch41: 0041-console-client-ignore-stdin-close-event.patch
|
|
|
|
|
Patch42: 0042-delete-lxc-from-runc-CI-test.patch
|
|
|
|
|
Patch43: 0043-add-embedded-testcases.patch
|
|
|
|
|
Patch44: 0044-fix-the-error-of-ContainerStats-interface-field-valu.patch
|
|
|
|
|
Patch45: 0045-rollback-setuped-network-if-mult-network-failed.patch
|
|
|
|
|
Patch46: 0046-add-testcase-for-rollback-mutlnetworks.patch
|
|
|
|
|
Patch47: 0047-log-adjust-log-level-from-EVENT-to-WARN-to-reduce-lo.patch
|
|
|
|
|
Patch48: 0048-isulad-shim-fix-shim-exit-bug.patch
|
2021-05-18 14:48:15 +08:00
|
|
|
Patch49: 0049-support-pull-option-when-create-run-container.patch
|
|
|
|
|
Patch50: 0050-add-testcase-for-pull-option.patch
|
|
|
|
|
Patch51: 0051-remove-redundant-code.patch
|
|
|
|
|
Patch52: 0052-devicemapper-umount-when-resize2fs-command-failed.patch
|
|
|
|
|
Patch53: 0053-support-isula-exec-workdir.patch
|
|
|
|
|
Patch54: 0054-add-testcase-for-isula-exec-workdir.patch
|
|
|
|
|
Patch55: 0055-ignore-to-create-mtab-when-runtime-is-kata-runtime.patch
|
|
|
|
|
Patch56: 0056-remove-unchecked-layer-ignore-rootfs-layer.patch
|
|
|
|
|
Patch57: 0057-add-test-to-check-running-container-with-image-integ.patch
|
|
|
|
|
Patch58: 0058-fix-coredump-when-inspect-container-when-daemon-sets.patch
|
|
|
|
|
Patch59: 0059-Readme-add-related-resouces-in-readme.patch
|
|
|
|
|
Patch60: 0060-update-docs-build_guide_zh.md.patch
|
|
|
|
|
Patch61: 0061-fix-health_check.sh-execute-failure.patch
|
|
|
|
|
Patch62: 0062-support-cgroup-v2.patch
|
|
|
|
|
Patch63: 0063-add-testcases-for-cgroup-v2.patch
|
|
|
|
|
Patch64: 0064-Readme-add-configure-image-registry-address.patch
|
|
|
|
|
Patch65: 0065-add-iSulad-experiment-in-README.patch
|
|
|
|
|
Patch66: 0066-CI-add-testcase-for-long-label.patch
|
|
|
|
|
Patch67: 0067-event-fix-memory-leak-when-pack-annotation-failed.patch
|
|
|
|
|
Patch68: 0068-Readme-add-script-to-install-iSulad-on-Centos7.patch
|
|
|
|
|
Patch69: 0069-cri-fix-residual-IO-copy-thread-in-CRI-exec-operatio.patch
|
|
|
|
|
Patch70: 0070-CI-add-testcase-for-cri-stream.patch
|
|
|
|
|
Patch71: 0071-stats-show-cpu-usage-normal-when-stats-with-no-strea.patch
|
|
|
|
|
Patch72: 0072-Readme-add-script-to-install-iSulad-on-Ubuntu-20.04-.patch
|
|
|
|
|
Patch73: 0073-update-libarchive-requirement-to-v3.4.patch
|
|
|
|
|
Patch74: 0074-correct-the-mistake-package-libarchive-dev.patch
|
|
|
|
|
Patch75: 0075-Added-autocomplete-in-isula-command-line-mode.patch
|
|
|
|
|
Patch76: 0076-iSulad-fix-bugs-of-isula-runtime-ops.patch
|
|
|
|
|
Patch77: 0077-Compatible-with-registry-URL-ending-in.patch
|
|
|
|
|
Patch78: 0078-CI-fix-CI-to-fit-run-on-2-cpu-4G-memory-environment.patch
|
|
|
|
|
Patch79: 0079-added-default-completion.patch
|
|
|
|
|
Patch80: 0080-fix-coredump-when-poweroff.patch
|
|
|
|
|
Patch81: 0081-CI-keep-container-when-build-failed-for-debug.patch
|
|
|
|
|
Patch82: 0082-devmapper-decrease-log-level-of-check-dm-device.patch
|
|
|
|
|
Patch83: 0083-fix-bugs-when-pulling-image.patch
|
|
|
|
|
Patch84: 0084-add-testcase-for-pulling-image.patch
|
|
|
|
|
Patch85: 0085-check-return-value-to-valid-use-NULL-pointer.patch
|
|
|
|
|
Patch86: 0086-move-reinstall_thinpool-to-helper.sh.patch
|
|
|
|
|
Patch87: 0087-CI-activate-vg-isulad.patch
|
|
|
|
|
Patch88: 0088-CI-devicemapper-add-filter.patch
|
|
|
|
|
Patch89: 0089-syslog-tag-support-dynamic-tag-values.patch
|
|
|
|
|
Patch90: 0090-add-testcase-for-contailer-log-opts.patch
|
|
|
|
|
Patch91: 0091-CI-run-the-containers-one-by-one.patch
|
|
|
|
|
Patch92: 0092-completion-isula-images.patch
|
|
|
|
|
Patch93: 0093-fix-memory-leak-when-pulling-image.patch
|
|
|
|
|
Patch94: 0094-isula-fix-help-xx-coredump.patch
|
|
|
|
|
Patch95: 0095-workdir-must-be-absolute-path.patch
|
|
|
|
|
Patch96: 0096-check-if-pull-option-is-valid.patch
|
|
|
|
|
Patch97: 0097-fix-memory-usage-of-stats-not-right-when-runtime-is-.patch
|
|
|
|
|
Patch98: 0098-log-adjust-log-level-to-reduce-log.patch
|
|
|
|
|
Patch99: 0099-CI-use-ali-registry-instead-of-docker.io.patch
|
|
|
|
|
Patch100: 0100-do-not-check-key-s-case-when-parse-http-header.patch
|
|
|
|
|
Patch101: 0101-CI-use-docker.io-registry.patch
|
|
|
|
|
Patch102: 0102-CI-fix-integration_check.sh.patch
|
|
|
|
|
Patch103: 0103-optimize-token-generation.patch
|
|
|
|
|
Patch104: 0104-fix-string-array-initialization-failure.patch
|
2021-01-18 19:53:22 +08:00
|
|
|
|
2019-09-30 10:53:41 -04:00
|
|
|
%ifarch x86_64 aarch64
|
|
|
|
|
Provides: libhttpclient.so()(64bit)
|
2020-01-20 10:36:04 +08:00
|
|
|
Provides: libisula.so()(64bit)
|
2020-09-03 18:51:47 +08:00
|
|
|
Provides: libisulad_img.so()(64bit)
|
2019-09-30 10:53:41 -04:00
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if 0%{?is_systemd}
|
|
|
|
|
# Systemd 230 and up no longer have libsystemd-journal
|
|
|
|
|
BuildRequires: pkgconfig(systemd)
|
|
|
|
|
Requires: systemd-units
|
|
|
|
|
%else
|
|
|
|
|
Requires(post): chkconfig
|
|
|
|
|
Requires(preun): chkconfig
|
|
|
|
|
# This is for /sbin/service
|
|
|
|
|
Requires(preun): initscripts
|
|
|
|
|
%endif
|
|
|
|
|
|
2020-05-26 19:35:10 +08:00
|
|
|
BuildRequires: cmake gcc-c++ lxc lxc-devel lcr-devel yajl-devel clibcni-devel
|
2020-03-06 14:39:47 +08:00
|
|
|
BuildRequires: grpc grpc-plugins grpc-devel protobuf-devel
|
2020-09-03 18:51:47 +08:00
|
|
|
BuildRequires: libcurl libcurl-devel sqlite-devel libarchive-devel device-mapper-devel
|
2020-03-06 14:39:47 +08:00
|
|
|
BuildRequires: http-parser-devel
|
|
|
|
|
BuildRequires: libseccomp-devel libcap-devel libselinux-devel libwebsockets libwebsockets-devel
|
2020-11-25 16:07:20 +08:00
|
|
|
BuildRequires: systemd-devel git chrpath
|
2019-09-30 10:53:41 -04:00
|
|
|
|
2020-09-03 18:51:47 +08:00
|
|
|
Requires: lcr lxc clibcni
|
2020-05-26 19:35:10 +08:00
|
|
|
Requires: grpc protobuf
|
2019-12-29 15:59:28 +08:00
|
|
|
Requires: libcurl
|
2019-09-30 10:53:41 -04:00
|
|
|
Requires: sqlite http-parser libseccomp
|
2020-09-03 18:51:47 +08:00
|
|
|
Requires: libcap libselinux libwebsockets libarchive device-mapper
|
2020-03-06 14:39:47 +08:00
|
|
|
Requires: systemd
|
2019-09-30 10:53:41 -04:00
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
This is a umbrella project for gRPC-services based Lightweight Container
|
|
|
|
|
Runtime Daemon, written by C.
|
|
|
|
|
|
|
|
|
|
%prep
|
2020-05-26 19:35:10 +08:00
|
|
|
%autosetup -n %{name} -Sgit -p1
|
2019-09-30 10:53:41 -04:00
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
mkdir -p build
|
|
|
|
|
cd build
|
2020-09-03 18:51:47 +08:00
|
|
|
%cmake -DDEBUG=ON -DLIB_INSTALL_DIR=%{_libdir} -DCMAKE_INSTALL_PREFIX=/usr ../
|
2019-09-30 10:53:41 -04:00
|
|
|
%make_build
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
rm -rf %{buildroot}
|
|
|
|
|
cd build
|
|
|
|
|
install -d $RPM_BUILD_ROOT/%{_libdir}
|
2020-01-20 10:36:04 +08:00
|
|
|
install -m 0644 ./src/libisula.so %{buildroot}/%{_libdir}/libisula.so
|
2020-09-03 18:51:47 +08:00
|
|
|
install -m 0644 ./src/utils/http/libhttpclient.so %{buildroot}/%{_libdir}/libhttpclient.so
|
2020-11-25 16:07:20 +08:00
|
|
|
chrpath -d ./src/daemon/modules/image/libisulad_img.so
|
2020-09-03 18:51:47 +08:00
|
|
|
install -m 0644 ./src/daemon/modules/image/libisulad_img.so %{buildroot}/%{_libdir}/libisulad_img.so
|
|
|
|
|
chmod +x %{buildroot}/%{_libdir}/libisula.so
|
|
|
|
|
chmod +x %{buildroot}/%{_libdir}/libhttpclient.so
|
|
|
|
|
chmod +x %{buildroot}/%{_libdir}/libisulad_img.so
|
2019-09-30 10:53:41 -04:00
|
|
|
|
|
|
|
|
install -d $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
|
2020-01-20 10:36:04 +08:00
|
|
|
install -m 0640 ./conf/isulad.pc %{buildroot}/%{_libdir}/pkgconfig/isulad.pc
|
2019-09-30 10:53:41 -04:00
|
|
|
|
|
|
|
|
install -d $RPM_BUILD_ROOT/%{_bindir}
|
2020-11-25 16:07:20 +08:00
|
|
|
chrpath -d ./src/isula
|
2020-01-20 10:36:04 +08:00
|
|
|
install -m 0755 ./src/isula %{buildroot}/%{_bindir}/isula
|
2020-03-06 14:39:47 +08:00
|
|
|
install -m 0755 ./src/isulad-shim %{buildroot}/%{_bindir}/isulad-shim
|
2020-09-10 14:47:59 +08:00
|
|
|
chrpath -d ./src/isulad
|
2020-11-25 16:07:20 +08:00
|
|
|
install -m 0755 ./src/isulad %{buildroot}/%{_bindir}/isulad
|
2019-09-30 10:53:41 -04:00
|
|
|
|
2020-01-20 10:36:04 +08:00
|
|
|
install -d $RPM_BUILD_ROOT/%{_includedir}/isulad
|
2020-09-03 18:51:47 +08:00
|
|
|
install -m 0644 ../src/daemon/modules/api/image_api.h %{buildroot}/%{_includedir}/isulad/image_api.h
|
2019-09-30 10:53:41 -04:00
|
|
|
|
|
|
|
|
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/isulad
|
|
|
|
|
install -m 0640 ../src/contrib/config/daemon.json %{buildroot}/%{_sysconfdir}/isulad/daemon.json
|
|
|
|
|
install -m 0640 ../src/contrib/config/seccomp_default.json %{buildroot}/%{_sysconfdir}/isulad/seccomp_default.json
|
|
|
|
|
|
2020-01-20 10:36:04 +08:00
|
|
|
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/default/isulad
|
|
|
|
|
install -m 0640 ../src/contrib/config/config.json %{buildroot}/%{_sysconfdir}/default/isulad/config.json
|
|
|
|
|
install -m 0640 ../src/contrib/config/systemcontainer_config.json %{buildroot}/%{_sysconfdir}/default/isulad/systemcontainer_config.json
|
|
|
|
|
install -m 0550 ../src/contrib/sysmonitor/isulad-check.sh %{buildroot}/%{_sysconfdir}/default/isulad/isulad-check.sh
|
2019-09-30 10:53:41 -04:00
|
|
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysmonitor/process
|
|
|
|
|
cp ../src/contrib/sysmonitor/isulad-monit $RPM_BUILD_ROOT/etc/sysmonitor/process
|
|
|
|
|
|
2020-01-20 10:36:04 +08:00
|
|
|
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/default/isulad/hooks
|
|
|
|
|
install -m 0640 ../src/contrib/config/hooks/default.json %{buildroot}/%{_sysconfdir}/default/isulad/hooks/default.json
|
2019-09-30 10:53:41 -04:00
|
|
|
|
|
|
|
|
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
|
|
|
|
|
install -p -m 0640 ../src/contrib/config/iSulad.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/iSulad
|
|
|
|
|
|
|
|
|
|
%if 0%{?is_systemd}
|
|
|
|
|
install -d $RPM_BUILD_ROOT/%{_unitdir}
|
2020-01-20 10:36:04 +08:00
|
|
|
install -p -m 0640 ../src/contrib/init/isulad.service $RPM_BUILD_ROOT/%{_unitdir}/isulad.service
|
2019-09-30 10:53:41 -04:00
|
|
|
%else
|
|
|
|
|
install -d $RPM_BUILD_ROOT/%{_initddir}
|
2020-01-20 10:36:04 +08:00
|
|
|
install -p -m 0640 ../src/contrib/init/isulad.init $RPM_BUILD_ROOT/%{_initddir}/isulad.init
|
2019-09-30 10:53:41 -04:00
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%clean
|
|
|
|
|
rm -rf %{buildroot}
|
|
|
|
|
|
2020-01-20 10:36:04 +08:00
|
|
|
%pre
|
|
|
|
|
# support update from lcrd to isulad, will remove in next version
|
2020-01-21 10:01:32 +08:00
|
|
|
if [ "$1" = "2" ]; then
|
2020-01-20 10:36:04 +08:00
|
|
|
%if 0%{?is_systemd}
|
|
|
|
|
systemctl stop lcrd
|
|
|
|
|
systemctl disable lcrd
|
|
|
|
|
if [ -e %{_sysconfdir}/isulad/daemon.json ];then
|
|
|
|
|
sed -i 's#/etc/default/lcrd/hooks#/etc/default/isulad/hooks#g' %{_sysconfdir}/isulad/daemon.json
|
|
|
|
|
fi
|
|
|
|
|
%else
|
|
|
|
|
/sbin/chkconfig --del lcrd
|
|
|
|
|
%endif
|
2020-01-21 10:01:32 +08:00
|
|
|
fi
|
2020-01-20 10:36:04 +08:00
|
|
|
|
2019-09-30 10:53:41 -04:00
|
|
|
%post
|
2020-10-14 15:32:32 +08:00
|
|
|
if ! getent group isula > /dev/null; then
|
|
|
|
|
groupadd --system isula
|
2019-09-30 10:53:41 -04:00
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ "$1" = "1" ]; then
|
|
|
|
|
%if 0%{?is_systemd}
|
2020-01-20 10:36:04 +08:00
|
|
|
systemctl enable isulad
|
|
|
|
|
systemctl start isulad
|
2019-09-30 10:53:41 -04:00
|
|
|
%else
|
2020-01-20 10:36:04 +08:00
|
|
|
/sbin/chkconfig --add isulad
|
2019-09-30 10:53:41 -04:00
|
|
|
%endif
|
|
|
|
|
elif [ "$1" = "2" ]; then
|
|
|
|
|
%if 0%{?is_systemd}
|
2020-01-20 10:36:04 +08:00
|
|
|
# support update from lcrd to isulad, will remove in next version
|
|
|
|
|
if [ -e %{_unitdir}/lcrd.service.rpmsave ]; then
|
|
|
|
|
mv %{_unitdir}/lcrd.service.rpmsave %{_unitdir}/isulad.service
|
|
|
|
|
sed -i 's/lcrd/isulad/g' %{_unitdir}/isulad.service
|
|
|
|
|
fi
|
|
|
|
|
systemctl status isulad | grep 'Active:' | grep 'running'
|
2019-09-30 10:53:41 -04:00
|
|
|
if [ $? -eq 0 ]; then
|
2020-01-20 10:36:04 +08:00
|
|
|
systemctl restart isulad
|
|
|
|
|
else
|
|
|
|
|
systemctl start isulad
|
2019-09-30 10:53:41 -04:00
|
|
|
fi
|
|
|
|
|
%else
|
2020-01-20 10:36:04 +08:00
|
|
|
/sbin/service isulad status | grep 'Active:' | grep 'running'
|
2019-09-30 10:53:41 -04:00
|
|
|
if [ $? -eq 0 ]; then
|
2020-01-20 10:36:04 +08:00
|
|
|
/sbin/service isulad restart
|
2019-09-30 10:53:41 -04:00
|
|
|
fi
|
|
|
|
|
%endif
|
|
|
|
|
fi
|
|
|
|
|
|
2020-10-14 15:32:32 +08:00
|
|
|
if ! getent group isula > /dev/null; then
|
|
|
|
|
groupadd --system isula
|
2019-09-30 10:53:41 -04:00
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
%preun
|
|
|
|
|
%if 0%{?is_systemd}
|
2020-01-20 10:36:04 +08:00
|
|
|
%systemd_preun isulad
|
2019-09-30 10:53:41 -04:00
|
|
|
%else
|
|
|
|
|
if [ $1 -eq 0 ] ; then
|
2020-01-20 10:36:04 +08:00
|
|
|
/sbin/service isulad stop >/dev/null 2>&1
|
|
|
|
|
/sbin/chkconfig --del isulad
|
2019-09-30 10:53:41 -04:00
|
|
|
fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%postun
|
|
|
|
|
%if 0%{?is_systemd}
|
2020-01-20 10:36:04 +08:00
|
|
|
%systemd_postun_with_restart isulad
|
2019-09-30 10:53:41 -04:00
|
|
|
%else
|
|
|
|
|
if [ "$1" -ge "1" ] ; then
|
2020-01-20 10:36:04 +08:00
|
|
|
/sbin/service isulad condrestart >/dev/null 2>&1 || :
|
2019-09-30 10:53:41 -04:00
|
|
|
fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
|
%attr(0600,root,root) %{_sysconfdir}/sysmonitor/process/isulad-monit
|
2020-01-20 10:36:04 +08:00
|
|
|
%attr(0550,root,root) %{_sysconfdir}/default/isulad/isulad-check.sh
|
2019-09-30 10:53:41 -04:00
|
|
|
%defattr(0640,root,root,0750)
|
2019-11-06 19:33:20 +08:00
|
|
|
%{_sysconfdir}/isulad
|
2019-09-30 10:53:41 -04:00
|
|
|
%{_sysconfdir}/isulad/*
|
|
|
|
|
%{_sysconfdir}/default/*
|
|
|
|
|
%defattr(-,root,root,-)
|
|
|
|
|
%if 0%{?is_systemd}
|
2020-01-20 10:36:04 +08:00
|
|
|
%{_unitdir}/isulad.service
|
|
|
|
|
%attr(0640,root,root) %{_unitdir}/isulad.service
|
2019-09-30 10:53:41 -04:00
|
|
|
%else
|
2020-01-20 10:36:04 +08:00
|
|
|
%{_initddir}/isulad.init
|
|
|
|
|
%attr(0640,root,root) %{_initddir}/isulad.init
|
2019-09-30 10:53:41 -04:00
|
|
|
%endif
|
2020-01-20 10:36:04 +08:00
|
|
|
%{_includedir}/isulad/*
|
2019-09-30 10:53:41 -04:00
|
|
|
%attr(0755,root,root) %{_libdir}/pkgconfig
|
2020-01-20 10:36:04 +08:00
|
|
|
%attr(0640,root,root) %{_libdir}/pkgconfig/isulad.pc
|
2020-10-15 14:13:05 +08:00
|
|
|
%defattr(0755,root,root,0755)
|
2019-09-30 10:53:41 -04:00
|
|
|
%{_bindir}/*
|
|
|
|
|
%{_libdir}/*
|
|
|
|
|
%attr(0640,root,root) %{_sysconfdir}/sysconfig/iSulad
|
|
|
|
|
%attr(0640,root,root) %{_sysconfdir}/isulad/daemon.json
|
|
|
|
|
|
|
|
|
|
%config(noreplace,missingok) %{_sysconfdir}/sysconfig/iSulad
|
|
|
|
|
%config(noreplace,missingok) %{_sysconfdir}/isulad/daemon.json
|
|
|
|
|
%if 0%{?is_systemd}
|
2020-01-20 10:36:04 +08:00
|
|
|
%config(noreplace,missingok) %{_unitdir}/isulad.service
|
2019-09-30 10:53:41 -04:00
|
|
|
%else
|
2020-01-20 10:36:04 +08:00
|
|
|
%config(noreplace,missingok) %{_initddir}/isulad.init
|
2019-09-30 10:53:41 -04:00
|
|
|
%endif
|
2020-09-02 11:48:42 +08:00
|
|
|
|
|
|
|
|
%changelog
|
2021-05-18 14:48:15 +08:00
|
|
|
* Tue May 18 2021 wangfengtu <wangfengtu@huawei.com> - 2.0.8-20210518.144540.git5288ed92
|
|
|
|
|
- Type: sync from upstream
|
|
|
|
|
- ID: NA
|
|
|
|
|
- SUG: NA
|
|
|
|
|
- DESC: update from master
|
|
|
|
|
|
2021-03-26 09:41:54 +08:00
|
|
|
* Fri Mar 26 2021 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.8-20210326.094027.gitac974aa6
|
|
|
|
|
- Type: sync from upstream
|
|
|
|
|
- ID: NA
|
|
|
|
|
- SUG: NA
|
|
|
|
|
- DESC: update from master
|
|
|
|
|
|
2021-03-23 09:50:40 +08:00
|
|
|
* Tue Mar 23 2021 haozi007 <liuhao27@huawei.com> - 20210323.094917.git7e6aa593
|
|
|
|
|
- Type: sync from upstream
|
|
|
|
|
- ID: NA
|
|
|
|
|
- SUG: NA
|
|
|
|
|
- DESC: update from master
|
|
|
|
|
|
2021-02-02 15:33:40 +08:00
|
|
|
* Tue Feb 2 2021 lifeng <lifeng68@huawei.com> - 2.0.8-20210202.153251.gite082dcf3
|
|
|
|
|
- Type: sync from upstream
|
|
|
|
|
- ID: NA
|
|
|
|
|
- SUG: NA
|
|
|
|
|
- DESC: update from master
|
|
|
|
|
|
2021-02-19 13:28:48 +08:00
|
|
|
* Mon Jan 18 2021 lifeng <lifeng68@huawei.com> - 2.0.8-20210118.195254.git077e10f2
|
2021-01-18 19:53:22 +08:00
|
|
|
- Type: sync from upstream
|
|
|
|
|
- ID: NA
|
|
|
|
|
- SUG: NA
|
|
|
|
|
- DESC: update from master
|
|
|
|
|
|
2020-12-30 16:00:53 +08:00
|
|
|
* Wed Dec 30 2020 lifeng <lifeng68@huawei.com> - 2.0.8-20201230.155843.git6557a6eb
|
|
|
|
|
- Type: update to v2.0.8
|
|
|
|
|
- ID: NA
|
|
|
|
|
- SUG: NA
|
|
|
|
|
- DESC: update from master
|
|
|
|
|
|
2020-12-07 15:20:40 +08:00
|
|
|
* Mon Dec 7 2020 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.7-20201207.151847.gita1fce123
|
|
|
|
|
- Type: update
|
|
|
|
|
- ID: NA
|
|
|
|
|
- SUG: NA
|
|
|
|
|
- DESC: update from master
|
|
|
|
|
|
2020-12-05 14:59:33 +08:00
|
|
|
* Sat Dec 5 2020 lifeng <lifeng68@huawei.com> - 2.0.7-20201205.145752.gita461cc51
|
|
|
|
|
- Type: bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: ignore list containers errors
|
|
|
|
|
|
2020-12-03 19:12:21 +08:00
|
|
|
* Thu Dec 3 2020 haozi007 <liuhao27@huawei.com> - 2.0.7-20201203.190902.git48f598fd
|
|
|
|
|
- Type:update from master
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: update from master
|
|
|
|
|
|
2020-11-28 09:57:06 +08:00
|
|
|
* Sat Nov 28 2020 lifeng<lifeng68@huawei.com> - 2.0.7-20201128.095506.git1e1623a5
|
|
|
|
|
- Type: bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: Mounts: only qsort the configed mounts and make possible to bind mount /proc and /sys/fs.
|
|
|
|
|
- related lxc PR fixed:
|
|
|
|
|
- 1.add check whether have /proc mounts entry, if has, skip the auto
|
|
|
|
|
- 2.mount cgroup before do mount entrys
|
|
|
|
|
- 3.pass if the mount on top of /proc and the source of the mount is a proc filesystem
|
|
|
|
|
|
2020-11-25 16:53:48 +08:00
|
|
|
* Wed Nov 25 2020 wangfengtu<wangfengtu@huawei.com> - 2.0.7-20201125.165149.git7d150c3c
|
|
|
|
|
- Type: bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: update from openeuler
|
|
|
|
|
|
2020-11-25 16:07:20 +08:00
|
|
|
* Wed Nov 25 2020 wangfengtu<wangfengtu@huawei.com> - 2.0.6-20201125.160534.git9fb5e75d
|
|
|
|
|
- Type: bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: fix rpath not work
|
|
|
|
|
|
2020-11-12 19:32:18 +08:00
|
|
|
* Thu Nov 12 2020 gaohuatao<gaohuatao@huawei.com> - 2.0.6-20201112.193005.git8a6b73c8
|
|
|
|
|
- Type: update from openeuler
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: update from openeuler
|
|
|
|
|
|
2020-10-14 15:32:32 +08:00
|
|
|
* Wed Oct 14 2020 lifeng68<lifeng68@huawei.com> - 2.0.6-20201014.152749.gitc8a43925
|
|
|
|
|
- Type: upgrade to v2.0.6
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: upgrade to v2.0.6
|
|
|
|
|
|
|
|
|
|
* Fri Sep 18 2020 <lifeng68@huawei.com> - 2.0.5-20200918.112827.git9aea9b75
|
|
|
|
|
- Type:bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: modify log level to warn
|
|
|
|
|
|
|
|
|
|
* Mon Sep 14 2020 <lifeng68@huawei.com> - 2.0.5-20200914.172527.gitae86920a
|
|
|
|
|
- Type:bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: remove unused config
|
2020-09-14 17:28:42 +08:00
|
|
|
|
2020-09-10 14:47:59 +08:00
|
|
|
* Tue Sep 10 2020 <yangjiaqi11@huawei.com> - 2.0.5-20200910.144345.git71b1055b
|
|
|
|
|
- Type:enhancement
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: add chrpath
|
|
|
|
|
|
2020-09-03 18:51:47 +08:00
|
|
|
* Fri Sep 04 2020 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.5-20200904.114315.gitff1761c3
|
|
|
|
|
- Type:enhancement
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: upgrade from v2.0.3 to v2.0.5
|
|
|
|
|
|
2020-09-02 11:48:42 +08:00
|
|
|
* Wed Sep 02 2020 YoungJQ <yangjiaqi11@huawei.com> - 2.0.3-20200902.114727.git6d945f26
|
|
|
|
|
- Type:enhancement
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC: modify source0 address
|