packages: bump containerd to 1.2.14

Fixes: #2854
scality · Oct 16, 2020 · a60b873 · a60b873
1 parent 95cc73b
commit a60b873
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -20,8 +20,8 @@
 CALICO_VERSION     : str = '3.12.0'
 K8S_VERSION        : str = '1.16.13'
 SALT_VERSION       : str = '3000.3'
-CONTAINERD_VERSION : str = '1.2.13'
-CONTAINERD_RELEASE : str = '2.el7'
+CONTAINERD_VERSION : str = '1.2.14'
+CONTAINERD_RELEASE : str = '1.el7'
 
 def load_version_information() -> None:
     """Load version information from `VERSION`."""

diff --git a/packages/redhat/containerd.spec b/packages/redhat/containerd.spec
@@ -1,5 +1,5 @@
 %global goipath github.com/containerd/containerd
-Version:        1.2.13
+Version:        1.2.14
 
 %if %{defined fedora}
 %gometa
@@ -32,7 +32,7 @@ go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-seccomp}" -ldflags
 
 
 Name:           containerd
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        An industry-standard container runtime
 License:        ASL 2.0
 URL:            https://containerd.io
@@ -56,7 +56,7 @@ Provides:       bundled(golang(github.com/BurntSushi/toml)) = a368813c5e648fee92
 Provides:       bundled(golang(github.com/containerd/aufs)) = ffa39970e26ad01d81f540b21e65f9c1841a5f92
 Provides:       bundled(golang(github.com/containerd/btrfs)) = 2e1aa0ddf94f91fa282b6ed87c23bf0d64911244
 Provides:       bundled(golang(github.com/containerd/cgroups)) = c4b9ac5c7601384c965b9646fc515884e091ebb9
-Provides:       bundled(golang(github.com/containerd/console)) = c12b1e7919c14469339a5d38f2f8ed9b64a9de23
+Provides:       bundled(golang(github.com/containerd/console)) = 8375c3424e4d7b114e8a90a4a40c8e1b40d1d4e6
 Provides:       bundled(golang(github.com/containerd/continuity)) = bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
 Provides:       bundled(golang(github.com/containerd/cri)) = b1052f3b73fb9f0a6805d3c20e884a4cef265a38
 Provides:       bundled(golang(github.com/containerd/fifo)) = 3d5202aec260678c48179c56f40e6f38a095738c
@@ -210,6 +210,9 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
 
 
 %changelog
+* Fri Oct 16 2020 Guillaume Demonet <guillaume.demonet@scality.com> - 1.2.14-1
+- Latest upstream
+
 * Mon Apr 6 2020 Nicolas Trangez <nicolas.trangez@scality.com> - 1.2.13-2
 - Enable seccomp support