2019-12-30 12:24:38 +08:00
|
|
|
%global goipath github.com/containerd/containerd
|
|
|
|
|
%global debug_package %{nil}
|
|
|
|
|
Version: 1.2.0
|
|
|
|
|
Name: containerd
|
2022-06-22 14:46:29 +08:00
|
|
|
Release: 302
|
2019-12-30 12:24:38 +08:00
|
|
|
Summary: An industry-standard container runtime
|
|
|
|
|
License: ASL 2.0
|
|
|
|
|
URL: https://containerd.io
|
2020-09-14 14:58:02 +08:00
|
|
|
Source0: https://github.com/containerd/containerd/archive/v1.2.0.zip
|
2020-06-09 23:39:19 -04:00
|
|
|
Source1: patch.tar.gz
|
|
|
|
|
Source2: apply-patch
|
|
|
|
|
Source3: series.conf
|
|
|
|
|
Source4: git-commit
|
|
|
|
|
Source5: gen-commit.sh
|
2019-12-30 12:24:38 +08:00
|
|
|
|
|
|
|
|
BuildRequires: golang glibc-static make btrfs-progs-devel
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
containerd is an industry-standard container runtime with an emphasis on
|
|
|
|
|
simplicity, robustness and portability. It is available as a daemon for Linux
|
|
|
|
|
and Windows, which can manage the complete container lifecycle of its host
|
|
|
|
|
system: image transfer and storage, container execution and supervision,
|
|
|
|
|
low-level storage and network attachments, etc.
|
|
|
|
|
|
|
|
|
|
%prep
|
2020-06-09 23:39:19 -04:00
|
|
|
cp %{SOURCE0} .
|
|
|
|
|
cp %{SOURCE1} .
|
|
|
|
|
cp %{SOURCE2} .
|
|
|
|
|
cp %{SOURCE3} .
|
|
|
|
|
cp %{SOURCE4} .
|
2019-12-30 12:24:38 +08:00
|
|
|
|
|
|
|
|
%build
|
2020-06-09 23:39:19 -04:00
|
|
|
bash ./apply-patch
|
2019-12-30 12:24:38 +08:00
|
|
|
|
|
|
|
|
GO_BUILD_PATH=$PWD/_build
|
|
|
|
|
install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})
|
|
|
|
|
ln -fs $PWD $GO_BUILD_PATH/src/%{goipath}
|
|
|
|
|
cd $GO_BUILD_PATH/src/%{goipath}
|
2022-01-26 20:03:57 +08:00
|
|
|
export GO111MODULE=off
|
2019-12-30 12:24:38 +08:00
|
|
|
export GOPATH=$GO_BUILD_PATH:%{gopath}
|
|
|
|
|
export BUILDTAGS="no_btrfs no_cri"
|
|
|
|
|
make
|
2021-03-18 10:37:38 +08:00
|
|
|
strip ./bin/containerd ./bin/containerd-shim
|
2019-12-30 12:24:38 +08:00
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
install -d $RPM_BUILD_ROOT/%{_bindir}
|
|
|
|
|
install -p -m 755 bin/containerd $RPM_BUILD_ROOT/%{_bindir}/containerd
|
|
|
|
|
install -p -m 755 bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/containerd-shim
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
|
%{_bindir}/containerd
|
|
|
|
|
%{_bindir}/containerd-shim
|
|
|
|
|
|
|
|
|
|
%changelog
|
2022-06-22 14:46:29 +08:00
|
|
|
* Wed Jun 22 2022 zhangsong234<zhangsong34@huawei.com> - 1.2.0-302
|
|
|
|
|
- Type:bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC:put get pid lock after set process exited to avoid deadlock
|
|
|
|
|
|
2022-05-23 10:34:51 +08:00
|
|
|
* Tue May 10 2022 Vanient<xiadanni1@huawei.com> - 1.2.0-301
|
|
|
|
|
- Type:bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC:Use fs.RootPath when mounting volumes for bundle dir to fix CVE-2022-23648
|
|
|
|
|
|
|
|
|
|
* Sat Jan 22 2022 songyanting<songyanting@huawei.com> - 1.2.0-300
|
2022-01-26 20:03:57 +08:00
|
|
|
- Type:bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC:sync bugfix, include
|
|
|
|
|
1. add check in spec
|
|
|
|
|
2. kill container init process if runc start returns error
|
2022-05-23 10:34:51 +08:00
|
|
|
3. fix containerd-shim residual when kill containerd durin
|
2022-01-26 20:03:57 +08:00
|
|
|
4. fix deadlock on commit error
|
|
|
|
|
5. backport upstream & ttrpc patches
|
|
|
|
|
6. fix exec event missing due to pid reuse
|
|
|
|
|
7. fix dm left when pause container and kill shim
|
|
|
|
|
8. add CGO security build options
|
|
|
|
|
9. fix start container failed with id exists
|
|
|
|
|
10. drop opt package
|
|
|
|
|
11. fix race access for mobySubscribed
|
|
|
|
|
12. improve log for debugging
|
|
|
|
|
13. reduce permission for bundle dir
|
|
|
|
|
14. fix publish command wait block forever
|
|
|
|
|
|
2022-05-23 10:34:51 +08:00
|
|
|
* Mon Jan 10 2022 xiadanni<xiadanni1@huawei.com> - 1.2.0-109
|
|
|
|
|
- Type:bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC:disable go module build
|
|
|
|
|
|
2021-03-18 10:37:38 +08:00
|
|
|
* Thu Mar 18 2021 xiadanni<xiadanni1@huawei.com> - 1.2.0-108
|
|
|
|
|
- Type:bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC:compile option compliance
|
|
|
|
|
|
2021-03-18 10:15:32 +08:00
|
|
|
* Thu Mar 18 2021 xiadanni<xiadanni1@huawei.com> - 1.2.0-107
|
|
|
|
|
- Type:bugfix
|
|
|
|
|
- ID:NA
|
|
|
|
|
- SUG:NA
|
|
|
|
|
- DESC:sync bugfix, include
|
|
|
|
|
1. check task list to avoid unnecessary cleanup.
|
|
|
|
|
2. fix dead loop
|
|
|
|
|
3. cleanup dangling shim by brand new context
|
|
|
|
|
4. fix potential panic for task in unknown state
|
|
|
|
|
|
2020-12-15 14:29:00 +08:00
|
|
|
* Fri Dec 11 2020 yangyanchao <yangyanchao6@huawei.com> 1.2.0-106
|
|
|
|
|
- Type:requirement
|
|
|
|
|
- ID:NA
|
|
|
|
|
- CVE:NA
|
|
|
|
|
- SUG:restart
|
|
|
|
|
- DESC:containerd:vendor:add some symbol to support riscv
|
