From 4b137a91095f07c6695f26ae9b627f8872eddc4f Mon Sep 17 00:00:00 2001 From: xu_lei_123 Date: Sun, 28 May 2023 21:57:18 +0800 Subject: [PATCH 1/5] add other binaries to support high version --- apply-patch | 2 +- config.toml | 14 ++++++++++++++ containerd.service | 13 +++++++++++++ containerd.spec | 34 ++++++++++++++++++++++++++-------- 4 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 config.toml create mode 100644 containerd.service diff --git a/apply-patch b/apply-patch index 82384d2..d26b725 100755 --- a/apply-patch +++ b/apply-patch @@ -34,5 +34,5 @@ do done <"$series" cd $cwd cp -rf $src/* . -mv $src/.git $src/git +mv $src/.git $cwd/git rm -rf containerd-1.6.20 diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..c8bc86b --- /dev/null +++ b/config.toml @@ -0,0 +1,14 @@ +#root = "/var/lib/containerd" +#state = "/run/containerd" +#subreaper = true +#oom_score = 0 +#[grpc] +# address = "/run/containerd/containerd.sock" +# uid = 0 +# gid = 0 +#[debug] +# address = "/run/containerd/debug.sock" +# uid = 0 +# gid = 0 +# level = "info" + diff --git a/containerd.service b/containerd.service new file mode 100644 index 0000000..08c6a2e --- /dev/null +++ b/containerd.service @@ -0,0 +1,13 @@ +[Unit] +Description=containerd container runtime +Documentation=https://containerd.io +After=network.target + +[Service] +ExecStartPre=/sbin/modprobe overlay +ExecStart=/usr/bin/containerd +Delegate=yes +KillMode=process + +[Install] +WantedBy=multi-user.target diff --git a/containerd.spec b/containerd.spec index 0d090e8..e1e90c7 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.6.20 Name: containerd -Release: 2 +Release: 3 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -12,6 +12,8 @@ Source2: apply-patch Source3: series.conf Source4: git-commit Source5: gen-commit.sh +Source6: containerd.service +Source7: config.toml BuildRequires: golang glibc-static make btrfs-progs-devel git @@ -41,20 +43,36 @@ export GO111MODULE=off export GOPATH=$GO_BUILD_PATH:%{gopath} export BUILDTAGS="no_btrfs no_cri" make -strip ./bin/containerd ./bin/containerd-shim ./bin/ctr %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 -install -p -m 755 bin/ctr $RPM_BUILD_ROOT/%{_bindir}/ctr +install -p -m 755 bin/* $RPM_BUILD_ROOT/%{_bindir}/ +install -D -p -m 0644 %{S:6} %{buildroot}%{_unitdir}/containerd.service +install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml + +%post +%systemd_post containerd.service + +%preun +%systemd_prerun containerd.service + +%postun +%systemd_postun_with_restart containerd.service %files -%{_bindir}/containerd -%{_bindir}/containerd-shim -%{_bindir}/ctr +%{_bindir}/* +%{_unitdir}/containerd.service +%dir %{_sysconfdir}/containerd +%config(noreplace) %{_sysconfdir}/containerd/config.toml +%exclude %{_bindir}/containerd-stress %changelog +* Sun May 28 2023 xulei - 1.6.20-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add other binaries to support high version. + * Fri Apr 21 2023 xulei - 1.6.20-2 - Type:bugfix - ID:NA -- Gitee From 0808ec62881556ca6147feb67bcfe22a78a6dfa0 Mon Sep 17 00:00:00 2001 From: xulei Date: Mon, 29 May 2023 03:46:02 +0000 Subject: [PATCH 2/5] update containerd.spec Signed-off-by: xulei --- containerd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/containerd.spec b/containerd.spec index e1e90c7..e69de82 100644 --- a/containerd.spec +++ b/containerd.spec @@ -43,6 +43,7 @@ export GO111MODULE=off export GOPATH=$GO_BUILD_PATH:%{gopath} export BUILDTAGS="no_btrfs no_cri" make +strip ./bin/containerd ./bin/containerd-shim ./bin/ctr %install install -d $RPM_BUILD_ROOT/%{_bindir} -- Gitee From 6fdb9497e501c5b3a71ba4b22282542c4f253c8b Mon Sep 17 00:00:00 2001 From: xulei Date: Mon, 29 May 2023 08:04:21 +0000 Subject: [PATCH 3/5] update containerd.spec. Signed-off-by: xulei --- containerd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/containerd.spec b/containerd.spec index e69de82..d45233c 100644 --- a/containerd.spec +++ b/containerd.spec @@ -43,11 +43,15 @@ export GO111MODULE=off export GOPATH=$GO_BUILD_PATH:%{gopath} export BUILDTAGS="no_btrfs no_cri" make -strip ./bin/containerd ./bin/containerd-shim ./bin/ctr +strip ./bin/containerd ./bin/containerd-shim ./bin/containerd-shim-runc-v1 ./bin/containerd-shim-runc-v2 ./bin/ctr %install install -d $RPM_BUILD_ROOT/%{_bindir} -install -p -m 755 bin/* $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 +install -p -m 755 bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/containerd-shim-runc-v1 +install -p -m 755 bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/containerd-shim-runc-v2 +install -p -m 755 bin/ctr $RPM_BUILD_ROOT/%{_bindir}/ctr install -D -p -m 0644 %{S:6} %{buildroot}%{_unitdir}/containerd.service install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml -- Gitee From 6c5ed0acd7b673a895a2830abb81450a27d9543c Mon Sep 17 00:00:00 2001 From: xulei Date: Mon, 29 May 2023 08:06:41 +0000 Subject: [PATCH 4/5] update containerd.spec. Signed-off-by: xulei --- containerd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/containerd.spec b/containerd.spec index d45233c..a30aa9e 100644 --- a/containerd.spec +++ b/containerd.spec @@ -65,7 +65,11 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml %systemd_postun_with_restart containerd.service %files -%{_bindir}/* +%{_bindir}/containerd +%{_bindir}/containerd-shim +%{_bindir}/containerd-shim-runc-v1 +%{_bindir}/containerd-shim-runc-v2 +%{_bindir}/ctr %{_unitdir}/containerd.service %dir %{_sysconfdir}/containerd %config(noreplace) %{_sysconfdir}/containerd/config.toml -- Gitee From 86eb5543cbe8d1a9d2c37a973591a94b0bd4280f Mon Sep 17 00:00:00 2001 From: xulei Date: Mon, 29 May 2023 11:34:51 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20appl?= =?UTF-8?q?y-patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apply-patch | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100755 apply-patch diff --git a/apply-patch b/apply-patch deleted file mode 100755 index d26b725..0000000 --- a/apply-patch +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/bash - -# Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# Description: This shell script is used to apply patches for the project -# Author: zhangyu235@huawei.com -# Create: 2019-05-17 - -set -ex - -pkg=containerd-1.6.20 -cwd=$PWD -src=$cwd/$pkg - -unzip v1.6.20.zip -if [[ ! -d patch ]]; then - tar zxf patch.tar.gz -fi - -cd $src -git init -git add . -git config user.name 'build' -git config user.email 'build@obs.com' -git commit -m 'init build' -cd $cwd - -series=$cwd/series.conf -while IPF= read -r line -do - if [[ "$line" =~ ^patch* ]]; then - echo git apply $cwd/$line - cd $src && git apply $cwd/$line - fi -done <"$series" -cd $cwd -cp -rf $src/* . -mv $src/.git $cwd/git -rm -rf containerd-1.6.20 -- Gitee