!186 containerd:enable cri

From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
This commit is contained in:
openeuler-ci-bot 2024-04-24 09:31:11 +00:00 committed by Gitee
commit 92f36428e3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 9 additions and 3 deletions

View File

@ -2,7 +2,7 @@
%global debug_package %{nil} %global debug_package %{nil}
Version: 1.6.22 Version: 1.6.22
Name: containerd Name: containerd
Release: 12 Release: 13
Summary: An industry-standard container runtime Summary: An industry-standard container runtime
License: ASL 2.0 License: ASL 2.0
URL: https://containerd.io URL: https://containerd.io
@ -42,7 +42,7 @@ ln -fs $PWD $GO_BUILD_PATH/src/%{goipath}
cd $GO_BUILD_PATH/src/%{goipath} cd $GO_BUILD_PATH/src/%{goipath}
export GO111MODULE=off export GO111MODULE=off
export GOPATH=$GO_BUILD_PATH:%{gopath} export GOPATH=$GO_BUILD_PATH:%{gopath}
export BUILDTAGS="no_btrfs no_cri" export BUILDTAGS="no_btrfs"
make make
%install %install
@ -68,6 +68,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml
%exclude %{_bindir}/containerd-stress %exclude %{_bindir}/containerd-stress
%changelog %changelog
* Tue Apr 23 2024 zhongjiawei<zhongjiawei1@huawei.com> - 1.6.22-13
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:enable cri
* Mon Apr 07 2024 zhongjiawei<zhongjiawei1@huawei.com> - 1.6.22-12 * Mon Apr 07 2024 zhongjiawei<zhongjiawei1@huawei.com> - 1.6.22-12
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA

View File

@ -1 +1 @@
bb347b1bec7ed8dc34c91ee87dde406691c5080e dde8d115e2117709ad9d6e43ce328a706c779158