From 355c3bd29f7605d7b89a1cd7832872e4bcfe5121 Mon Sep 17 00:00:00 2001 From: xu_lei_123 Date: Sun, 28 May 2023 22:10:43 +0800 Subject: [PATCH 1/3] add other binaries to support high version --- apply-patch | 2 +- config.toml | 13 +++++++++++++ containerd.service | 13 +++++++++++++ containerd.spec | 34 ++++++++++++++++++++++++++-------- 4 files changed, 53 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..f4b4f4b --- /dev/null +++ b/config.toml @@ -0,0 +1,13 @@ +#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 f9e4377..83a4387 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 84d785eeca0287c4e4c1980b4751b34789fb6891 Mon Sep 17 00:00:00 2001 From: xulei Date: Mon, 29 May 2023 03:48:03 +0000 Subject: [PATCH 2/3] update containerd.spec Signed-off-by: xulei --- containerd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/containerd.spec b/containerd.spec index 83a4387..ce29a7e 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 502c9a173bbff47c3ee47c13bc76ecd7c9e5c366 Mon Sep 17 00:00:00 2001 From: xulei Date: Mon, 29 May 2023 08:16:05 +0000 Subject: [PATCH 3/3] update containerd.spec. Signed-off-by: xulei --- containerd.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/containerd.spec b/containerd.spec index ce29a7e..2483a5f 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 @@ -61,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