diff --git a/apply-patch b/apply-patch index 82384d23543a4aeff5746dfc3934bfcab21cffd8..d26b725afa1d1cde3732c69acec2274cdb3d9369 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 0000000000000000000000000000000000000000..f4b4f4ba4da0eb988340469618eb3ebe60893510 --- /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 0000000000000000000000000000000000000000..08c6a2e0a70e8108a96bcc557b2352bb1f3669cc --- /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 f9e43775dfa430f036d971035cd50bc242280d57..2483a5fe9a0be31c7c12ae7a85bcbc2770cbba6d 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,45 @@ 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/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 + +%post +%systemd_post containerd.service + +%preun +%systemd_prerun containerd.service + +%postun +%systemd_postun_with_restart containerd.service %files %{_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 +%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