diff --git a/SOURCES/containerd.toml b/SOURCES/containerd.toml index 4a76ac4..d8faa5e 100644 --- a/SOURCES/containerd.toml +++ b/SOURCES/containerd.toml @@ -1,9 +1,31 @@ -version = 2 +# Copyright 2018-2022 Docker Inc. -[plugins] - [plugins."io.containerd.grpc.v1.cri"] - [plugins."io.containerd.grpc.v1.cri".cni] - bin_dir = "/usr/libexec/cni/" - conf_dir = "/etc/cni/net.d" - [plugins."io.containerd.internal.v1.opt"] - path = "/var/lib/containerd/opt" +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +disabled_plugins = ["cri"] + +#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" \ No newline at end of file diff --git a/SPECS/containerd.spec b/SPECS/containerd.spec index de0b756..94cd3f1 100644 --- a/SPECS/containerd.spec +++ b/SPECS/containerd.spec @@ -35,7 +35,6 @@ Requires: libseccomp # SUSE flavors do not have container-selinux, # and libseccomp is named libseccomp2 Requires: libseccomp2 -Requires: runc %endif BuildRequires: make BuildRequires: gcc @@ -55,6 +54,7 @@ BuildRequires: btrfs-progs-devel %endif %endif +Requires: runc %{?systemd_requires} %description @@ -67,8 +67,9 @@ low-level storage and network attachments, etc. %prep %setup -q -n %{tarball_name}-%{version} -# symlink the go source path to our build directory +sed -i "s#/usr/local/bin/containerd#/usr/bin/containerd#" containerd.service mkdir -p ${RPM_BUILD_DIR}/go/src/github.com/containerd/ +# symlink the go source path to our build directory ln -s %{_topdir}/BUILD/%{tarball_name}-%{version} ${RPM_BUILD_DIR}/go/src/%{import_path} %build @@ -91,7 +92,7 @@ bin/ctr --version cd %{_topdir}/BUILD/%{tarball_name}-%{version} mkdir -p %{buildroot}%{_bindir} install -D -m 0755 bin/* %{buildroot}%{_bindir} -install -D -m 0644 containerd.service %{buildroot}%{_prefix}/local/bin/containerd.service +install -D -m 0644 containerd.service %{buildroot}%{_unitdir}/containerd.service install -D -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml # install manpages, taking into account that not all sections may be present @@ -118,7 +119,7 @@ done %license LICENSE %doc README.md %{_bindir}/* -%{_prefix}/local/bin/containerd.service +%{_unitdir}/containerd.service %{_sysconfdir}/containerd %{_mandir}/man*/* %config(noreplace) %{_sysconfdir}/containerd/config.toml