diff --git a/0001-Revert-commit-for-Windows-metrics.patch b/0001-Revert-commit-for-Windows-metrics.patch index 38f3f13..568f98f 100644 --- a/0001-Revert-commit-for-Windows-metrics.patch +++ b/0001-Revert-commit-for-Windows-metrics.patch @@ -15,7 +15,7 @@ diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics. index a83e45ef..f8371401 100644 --- a/cmd/ctr/commands/tasks/metrics.go +++ b/cmd/ctr/commands/tasks/metrics.go -@@ -25,9 +25,6 @@ import ( +@@ -23,9 +23,6 @@ import ( "os" "text/tabwriter" @@ -25,7 +25,7 @@ index a83e45ef..f8371401 100644 "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/typeurl" "github.com/urfave/cli" -@@ -79,42 +76,12 @@ var metricsCommand = cli.Command{ +@@ -77,42 +74,12 @@ var metricsCommand = cli.Command{ if err != nil { return err } @@ -68,7 +68,7 @@ index a83e45ef..f8371401 100644 return w.Flush() case formatJSON: marshaledJSON, err := json.MarshalIndent(anydata, "", " ") -@@ -128,83 +95,3 @@ var metricsCommand = cli.Command{ +@@ -126,83 +93,3 @@ var metricsCommand = cli.Command{ } }, } diff --git a/0002-Remove-windows-only-dep.patch b/0002-Remove-windows-only-dep.patch index 4411605..1749e83 100644 --- a/0002-Remove-windows-only-dep.patch +++ b/0002-Remove-windows-only-dep.patch @@ -1,16 +1,16 @@ diff --color -Naur a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go --- a/pkg/cri/server/helpers.go 2021-11-17 21:04:57.000000000 +0100 +++ b/pkg/cri/server/helpers.go 2021-11-22 22:39:01.743745977 +0100 -@@ -23,7 +23,7 @@ - "strconv" - "strings" +@@ -39,7 +39,7 @@ import ( + "github.com/containerd/typeurl" + "github.com/sirupsen/logrus" - runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" + // runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" - "github.com/containerd/containerd" - "github.com/containerd/containerd/containers" - clabels "github.com/containerd/containerd/labels" -@@ -366,8 +366,8 @@ + imagedigest "github.com/opencontainers/go-digest" + "github.com/pelletier/go-toml" + "golang.org/x/net/context" +@@ -365,8 +365,8 @@ func getRuntimeOptionsType(t string) int return &runcoptions.Options{} case plugin.RuntimeLinuxV1: return &runctypes.RuncOptions{} diff --git a/changelog b/changelog new file mode 100644 index 0000000..dbd16b6 --- /dev/null +++ b/changelog @@ -0,0 +1,135 @@ +* Mon Jan 31 2022 Maxwell G - 1.5.9-1 +- Update to 1.5.9. Fixes FTBFS. Closes rhbz#2045277. +- Mitigates CVE-2021-43816. Closes rhbz#2044434. Closes rhbz#2044436. +- Temporarily build using vendored dependencies. + +* Wed Jan 19 2022 Fedora Release Engineering - 1.5.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Nov 22 2021 Olivier Lemasle - 1.5.8-1 +- Update to upstream 1.5.8 (fixes rhbz#2013807) +- Mitigate CVE-2021-41190 (fixes GHSA-5j5w-g665-5m35, fixes rhbz#2024941) + +* Sun Oct 10 2021 Olivier Lemasle - 1.5.7-1 +- Update to upstream 1.5.7 (fixes rhbz#2009149) +- Fixes CVE-2021-41103 (fixes rhbz#2011014, rhbz#2011007) + +* Sun Aug 15 2021 Olivier Lemasle - 1.5.5-1 +- Update to upstream 1.5.5 (fixes rhbz#1983820) +- Fixes CVE-2021-32760 (rhbz#1983932) + +* Wed Jul 21 2021 Fedora Release Engineering - 1.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 14 11:28:54 CEST 2021 Olivier Lemasle - 1.5.3-1 +- Update to upstream 1.5.3 (fixes rhbz#1956638) + +* Tue May 04 2021 Olivier Lemasle - 1.5.0-1 +- Update to upstream 1.5.0 (#1956638) + +* Mon Apr 19 2021 Olivier Lemasle - 1.5.0~rc.1-1 +- Update to 1.5.0~rc.1 (#1948041) + +* Wed Mar 17 2021 Olivier Lemasle - 1.5.0~beta.4-1 +- Update to upstream 1.5.0-beta.4 + +* Sat Mar 06 2021 Olivier Lemasle - 1.5.0~beta.3-1 +- Update to upstream 1.5.0-beta.3 + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.5.0~beta.0-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Thu Jan 28 2021 Olivier Lemasle 1.5.0~beta.0-1 +- Update to 1.5.0~beta.0 (#1918993) + +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 01 2020 Olivier Lemasle - 1.4.3-1 +- Fix CVE-2020-15257 (#1903050) +- Update to latest upstream - 1.4.3 (#1901908) + +* Mon Nov 2 23:23:57 CET 2020 Olivier Lemasle - 1.4.1-2 +- Fix man pages + +* Wed Sep 30 2020 Robert-André Mauchin - 1.4.1-1 +- Update to 1.4.1 + +* Sat Aug 01 2020 Fedora Release Engineering - 1.3.3-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Apr 01 2020 Olivier Lemasle - 1.3.3-1 +- Update to 1.3.3 + +* Sun Mar 22 2020 Olivier Lemasle - 1.2.13-2 +- Remove version requirement on golang-github-containerd-cri + +* Sun Mar 22 2020 Olivier Lemasle - 1.2.13-1 +- Exclude failing integration tests +- Update to containerd 1.2.13 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed May 01 15:33:19 CEST 2019 Robert-André Mauchin - 1.2.6-1.20190501gitd68b593 +- Release 1.2.6, commit d68b593de4ab10bb8b4fd64560e10d43c7156db2 + +* Tue Feb 26 2019 Carl George - 1.2.4-1 +- Latest upstream + +* Thu Jan 31 2019 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jan 03 2019 Carl George - 1.2.1-1 +- Latest upstream +- Run test suite (except on el7 or %%arm) + +* Thu Oct 25 2018 Carl George - 1.2.0-1 +- Latest upstream + +* Mon Aug 13 2018 Carl George - 1.1.2-1 +- Latest upstream + +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Apr 26 2018 Carl George - 1.1.0-1 +- Latest upstream +- Build and include man pages + +* Wed Apr 04 2018 Carl George - 1.0.3-1 +- Latest upstream + +* Wed Feb 07 2018 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 22 2018 Carl George - 1.0.1-1 +- Latest upstream + +* Wed Dec 06 2017 Carl George - 1.0.0-1 +- Latest upstream + +* Fri Nov 10 2017 Carl George - 1.0.0-0.5.beta.3 +- Latest upstream + +* Thu Oct 19 2017 Carl George - 1.0.0-0.4.beta.2 +- Own /etc/containerd + +* Thu Oct 12 2017 Carl George - 1.0.0-0.3.beta.2 +- Latest upstream +- Require runc 1.0.0 https://github.com/containerd/containerd/issues/1508#issuecomment-335566293 + +* Mon Oct 09 2017 Carl George - 1.0.0-0.2.beta.1 +- Add provides for vendored dependencies +- Add ctr command + +* Wed Oct 04 2017 Carl George - 1.0.0-0.1.beta.1 +- Initial package diff --git a/containerd.service b/containerd.service deleted file mode 100644 index 08c6a2e..0000000 --- a/containerd.service +++ /dev/null @@ -1,13 +0,0 @@ -[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 8334142..cf17a52 100644 --- a/containerd.spec +++ b/containerd.spec @@ -7,7 +7,8 @@ # https://github.com/containerd/containerd %global goipath github.com/containerd/containerd -Version: 1.5.9 +Version: 1.6.0~rc.2 +%global tag v1.6.0-rc.2 %gometa @@ -26,14 +27,13 @@ low-level storage and network attachments, etc.} BUILDING.md README.md RELEASES.md Name: %{goname} -Release: 1%{?dist} +Release: %autorelease Summary: Open and reliable container runtime # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -Source1: containerd.service Source2: containerd.toml # Carve out code requiring github.com/Microsoft/hcsshim Patch0: 0001-Revert-commit-for-Windows-metrics.patch @@ -86,14 +86,17 @@ BuildRequires: golang(github.com/gogo/protobuf/types) BuildRequires: golang(github.com/gogo/protobuf/vanity) BuildRequires: golang(github.com/gogo/protobuf/vanity/command) BuildRequires: golang(github.com/google/uuid) +BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-middleware) BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-prometheus) BuildRequires: golang(github.com/hashicorp/go-multierror) BuildRequires: golang(github.com/imdario/mergo) +BuildRequires: golang(github.com/intel/goresctrl/pkg/rdt) BuildRequires: golang(github.com/klauspost/compress/zstd) # BuildRequires: golang(github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options) # BuildRequires: golang(github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats) BuildRequires: golang(github.com/moby/locker) BuildRequires: golang(github.com/moby/sys/mountinfo) +BuildRequires: golang(github.com/moby/sys/signal) BuildRequires: golang(github.com/moby/sys/symlink) BuildRequires: golang(github.com/opencontainers/go-digest) BuildRequires: golang(github.com/opencontainers/go-digest/digestset) @@ -105,21 +108,33 @@ BuildRequires: golang(github.com/opencontainers/runtime-spec/specs-go) BuildRequires: golang(github.com/opencontainers/selinux/go-selinux) BuildRequires: golang(github.com/opencontainers/selinux/go-selinux/label) BuildRequires: golang(github.com/pelletier/go-toml) -BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/prometheus/client_golang/prometheus) BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(github.com/stretchr/testify/require) BuildRequires: golang(github.com/tchap/go-patricia/patricia) BuildRequires: golang(github.com/urfave/cli) +BuildRequires: golang(github.com/vishvananda/netlink) BuildRequires: golang(go.etcd.io/bbolt) +BuildRequires: golang(go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc) +BuildRequires: golang(go.opentelemetry.io/otel) +BuildRequires: golang(go.opentelemetry.io/otel/attribute) +BuildRequires: golang(go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc) +BuildRequires: golang(go.opentelemetry.io/otel/propagation) +BuildRequires: golang(go.opentelemetry.io/otel/sdk/resource) +BuildRequires: golang(go.opentelemetry.io/otel/sdk/trace) +BuildRequires: golang(go.opentelemetry.io/otel/semconv/v1.4.0) +BuildRequires: golang(go.opentelemetry.io/otel/trace) BuildRequires: golang(golang.org/x/net/context) BuildRequires: golang(golang.org/x/net/context/ctxhttp) BuildRequires: golang(golang.org/x/sync/errgroup) BuildRequires: golang(golang.org/x/sync/semaphore) +BuildRequires: golang(golang.org/x/sys/execabs) BuildRequires: golang(golang.org/x/sys/unix) BuildRequires: golang(google.golang.org/grpc) BuildRequires: golang(google.golang.org/grpc/backoff) BuildRequires: golang(google.golang.org/grpc/codes) BuildRequires: golang(google.golang.org/grpc/credentials) +BuildRequires: golang(google.golang.org/grpc/credentials/insecure) BuildRequires: golang(google.golang.org/grpc/grpclog) BuildRequires: golang(google.golang.org/grpc/health) BuildRequires: golang(google.golang.org/grpc/health/grpc_health_v1) @@ -132,7 +147,6 @@ BuildRequires: golang(k8s.io/apimachinery/pkg/api/errors) BuildRequires: golang(k8s.io/apimachinery/pkg/api/resource) BuildRequires: golang(k8s.io/apimachinery/pkg/apis/meta/v1) BuildRequires: golang(k8s.io/apimachinery/pkg/types) -BuildRequires: golang(k8s.io/apimachinery/pkg/util/clock) BuildRequires: golang(k8s.io/apimachinery/pkg/util/httpstream) BuildRequires: golang(k8s.io/apimachinery/pkg/util/httpstream/spdy) BuildRequires: golang(k8s.io/apimachinery/pkg/util/net) @@ -144,20 +158,21 @@ BuildRequires: golang(k8s.io/apiserver/pkg/util/wsstream) BuildRequires: golang(k8s.io/client-go/tools/remotecommand) BuildRequires: golang(k8s.io/client-go/util/cert) BuildRequires: golang(k8s.io/component-base/logs/logreduction) -BuildRequires: golang(k8s.io/cri-api/pkg/apis) +BuildRequires: golang(k8s.io/cri-api/pkg/apis/runtime/v1) BuildRequires: golang(k8s.io/cri-api/pkg/apis/runtime/v1alpha2) BuildRequires: golang(k8s.io/klog/v2) +BuildRequires: golang(k8s.io/utils/clock) BuildRequires: golang(k8s.io/utils/exec) %if %{with check} # Tests BuildRequires: golang(github.com/containerd/continuity/testutil) BuildRequires: golang(github.com/containerd/continuity/testutil/loopback) -BuildRequires: golang(github.com/golang/protobuf/proto) BuildRequires: golang(github.com/google/go-cmp/cmp) BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts) BuildRequires: golang(github.com/stretchr/testify/assert) -BuildRequires: golang(github.com/stretchr/testify/require) +BuildRequires: golang(google.golang.org/protobuf/proto) +BuildRequires: golang(k8s.io/utils/clock/testing) %endif Requires: runc @@ -172,6 +187,8 @@ Requires: runc %autopatch -p1 # Used only for generation: rm -rf cmd/protoc-gen-gogoctrd +# Replace default bin directory +sed -i "s|/usr/local/bin/containerd|/usr/bin/containerd|" containerd.service %if %{without bootstrap} %build @@ -198,8 +215,9 @@ install -D -p -m 0644 _man/containerd.8 %{buildroot}%{_mandir}/man8/containerd.8 install -D -p -m 0644 _man/containerd-config.8 %{buildroot}%{_mandir}/man8/containerd-config.8 install -D -p -m 0644 _man/ctr.8 %{buildroot}%{_mandir}/man8/ctr.8 install -D -p -m 0644 _man/containerd-config.toml.5 %{buildroot}%{_mandir}/man5/containerd-config.toml.5 -install -D -p -m 0644 %{S:1} %{buildroot}%{_unitdir}/containerd.service +install -D -p -m 0644 containerd.service %{buildroot}%{_unitdir}/containerd.service install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml +mkdir -p %{buildroot}%{_sharedstatedir}/containerd/opt %endif %post @@ -213,7 +231,7 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml %if %{with check} %check -%gocheck -d pkg/cri/server -t integration +%gocheck -d pkg/cri/server -t integration -d platforms %endif %if %{without bootstrap} @@ -229,147 +247,11 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml %{_unitdir}/containerd.service %dir %{_sysconfdir}/containerd %config(noreplace) %{_sysconfdir}/containerd/config.toml +%dir %{_sharedstatedir}/containerd +%dir %{_sharedstatedir}/containerd/opt %endif %gopkgfiles %changelog -* Mon Jan 31 2022 Maxwell G - 1.5.9-1 -- Update to 1.5.9. Fixes FTBFS. Closes rhbz#2045277. -- Mitigates CVE-2021-43816. Closes rhbz#2044434. Closes rhbz#2044436. -- Temporarily build using vendored dependencies. - -* Wed Jan 19 2022 Fedora Release Engineering - 1.5.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Nov 22 2021 Olivier Lemasle - 1.5.8-1 -- Update to upstream 1.5.8 (fixes rhbz#2013807) -- Mitigate CVE-2021-41190 (fixes GHSA-5j5w-g665-5m35, fixes rhbz#2024941) - -* Sun Oct 10 2021 Olivier Lemasle - 1.5.7-1 -- Update to upstream 1.5.7 (fixes rhbz#2009149) -- Fixes CVE-2021-41103 (fixes rhbz#2011014, rhbz#2011007) - -* Sun Aug 15 2021 Olivier Lemasle - 1.5.5-1 -- Update to upstream 1.5.5 (fixes rhbz#1983820) -- Fixes CVE-2021-32760 (rhbz#1983932) - -* Wed Jul 21 2021 Fedora Release Engineering - 1.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jul 14 11:28:54 CEST 2021 Olivier Lemasle - 1.5.3-1 -- Update to upstream 1.5.3 (fixes rhbz#1956638) - -* Tue May 04 2021 Olivier Lemasle - 1.5.0-1 -- Update to upstream 1.5.0 (#1956638) - -* Mon Apr 19 2021 Olivier Lemasle - 1.5.0~rc.1-1 -- Update to 1.5.0~rc.1 (#1948041) -- Skip failing unit test - -* Thu Mar 18 2021 Olivier Lemasle - 1.5.0~beta.4-2 -- Restore all unit tests execution - -* Wed Mar 17 2021 Olivier Lemasle - 1.5.0~beta.4-1 -- Update to upstream 1.5.0-beta.4 - -* Sat Mar 06 2021 Olivier Lemasle - 1.5.0~beta.3-1 -- Update to upstream 1.5.0-beta.3 - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.5.0~beta.0-2 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Thu Jan 28 2021 Olivier Lemasle 1.5.0~beta.0-1 -- Update to 1.5.0~beta.0 (#1918993) - -* Tue Jan 26 2021 Fedora Release Engineering - 1.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Dec 01 2020 Olivier Lemasle - 1.4.3-1 -- Fix CVE-2020-15257 (#1903050) -- Update to latest upstream - 1.4.3 (#1901908) - -* Mon Nov 2 23:23:57 CET 2020 Olivier Lemasle - 1.4.1-2 -- Fix man pages - -* Wed Sep 30 2020 Robert-André Mauchin - 1.4.1-1 -- Update to 1.4.1 - -* Sat Aug 01 2020 Fedora Release Engineering - 1.3.3-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Apr 01 2020 Olivier Lemasle - 1.3.3-1 -- Update to 1.3.3 - -* Sun Mar 22 2020 Olivier Lemasle - 1.2.13-2 -- Remove version requirement on golang-github-containerd-cri - -* Sun Mar 22 2020 Olivier Lemasle - 1.2.13-1 -- Exclude failing integration tests -- Update to containerd 1.2.13 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed May 01 15:33:19 CEST 2019 Robert-André Mauchin - 1.2.6-1.20190501gitd68b593 -- Release 1.2.6, commit d68b593de4ab10bb8b4fd64560e10d43c7156db2 - -* Tue Feb 26 2019 Carl George - 1.2.4-1 -- Latest upstream - -* Thu Jan 31 2019 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jan 03 2019 Carl George - 1.2.1-1 -- Latest upstream -- Run test suite (except on el7 or %%arm) - -* Thu Oct 25 2018 Carl George - 1.2.0-1 -- Latest upstream - -* Mon Aug 13 2018 Carl George - 1.1.2-1 -- Latest upstream - -* Thu Jul 12 2018 Fedora Release Engineering - 1.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Apr 26 2018 Carl George - 1.1.0-1 -- Latest upstream -- Build and include man pages - -* Wed Apr 04 2018 Carl George - 1.0.3-1 -- Latest upstream - -* Wed Feb 07 2018 Fedora Release Engineering - 1.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 22 2018 Carl George - 1.0.1-1 -- Latest upstream - -* Wed Dec 06 2017 Carl George - 1.0.0-1 -- Latest upstream - -* Fri Nov 10 2017 Carl George - 1.0.0-0.5.beta.3 -- Latest upstream - -* Thu Oct 19 2017 Carl George - 1.0.0-0.4.beta.2 -- Own /etc/containerd - -* Thu Oct 12 2017 Carl George - 1.0.0-0.3.beta.2 -- Latest upstream -- Require runc 1.0.0 https://github.com/containerd/containerd/issues/1508#issuecomment-335566293 - -* Mon Oct 09 2017 Carl George - 1.0.0-0.2.beta.1 -- Add provides for vendored dependencies -- Add ctr command - -* Wed Oct 04 2017 Carl George - 1.0.0-0.1.beta.1 -- Initial package +%autochangelog diff --git a/containerd.toml b/containerd.toml index fc3f9f7..4a76ac4 100644 --- a/containerd.toml +++ b/containerd.toml @@ -1,15 +1,9 @@ -#root = "/var/lib/containerd" -#state = "/run/containerd" -#subreaper = true -#oom_score = 0 +version = 2 -#[grpc] -# address = "/run/containerd/containerd.sock" -# uid = 0 -# gid = 0 - -#[debug] -# address = "/run/containerd/debug.sock" -# uid = 0 -# gid = 0 -# level = "info" +[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" diff --git a/sources b/sources index c78280e..ac9c54f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (containerd-1.5.9.tar.gz) = 13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b +SHA512 (containerd-1.6.0-rc.2.tar.gz) = 37aa74d85e870ab55a922a796020c1244d64605b23662890f34fc67852ce442cb0467774efea4b29ec5127fa0fefb6f78cc7bcda6e3ec425c029aa22385a0935