[Buildroot] [PATCH 1/2] runc: bump to version 1.0.0-rc6

[Buildroot] [PATCH 1/2] runc: bump to version 1.0.0-rc6

[Christian Stewart]

Previously, a specific commit hash from the Docker runc.installer was used to
determine the required runc version for the Docker Engine. This old commit hash
used was a untagged pre-1.0.0 release of runc, closer to an earlier release
candidate.

The runc version used in the Debian distribution is not the pinned version
previously used by Buildroot. It is the latest release candidate. The latest
release candidate is known to be compatible with the Docker Engine, and there is
no justification for pinning to an older RC anymore.

This commit bumps to the latest RC, 1.0.0-rc6. A v1.0.0 is expected soon.

Signed-off-by: Christian Stewart <christian@paral.in>
---
 package/runc/runc.hash | 2 +-
 package/runc/runc.mk   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/runc/runc.hash b/package/runc/runc.hash
index 853cbb1465..1636e5b8e9 100644
--- a/package/runc/runc.hash
+++ b/package/runc/runc.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256	994a3a0447fcbf7e37614b02aa5604d2d6b9fdb41e6870d8d3ff1138ed6e61ef  runc-69663f0bd4b60df09991c08812a60108003fa340.tar.gz
+sha256	a221f8380e7b5806031f54d423af6dde24c305dad49868056cf70e5f5f4ef771  runc-v1.0.0-rc6.tar.gz
 sha256  552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243  LICENSE
diff --git a/package/runc/runc.mk b/package/runc/runc.mk
index 7f42c962f3..0539661266 100644
--- a/package/runc/runc.mk
+++ b/package/runc/runc.mk
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-# docker-engine/hack/dockerfile/install/runc.installer:4 RUNC_COMMIT=...
-RUNC_VERSION = 69663f0bd4b60df09991c08812a60108003fa340
+RUNC_VERSION = v1.0.0-rc6
 RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION))
 RUNC_LICENSE = Apache-2.0
 RUNC_LICENSE_FILES = LICENSE
-- 
2.19.2

[Buildroot] [PATCH 2/2] docker-containerd: bump to version 1.2.1

[Christian Stewart]

This commit bumps docker-containerd to the latest tagged release, v1.2.1.

This release is compatible with the current docker engine release (18.09).

Signed-off-by: Christian Stewart <christian@paral.in>
---
 package/docker-containerd/docker-containerd.hash | 2 +-
 package/docker-containerd/docker-containerd.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
index a530873974..52bf8e03d2 100644
--- a/package/docker-containerd/docker-containerd.hash
+++ b/package/docker-containerd/docker-containerd.hash
@@ -1,3 +1,3 @@
 # Computed locally
-sha256	a946f4614d92d60361213ef18deab04ee73599e4567f1ff26f7a72841afe4fa2	docker-containerd-v1.1.3.tar.gz
+sha256	a2780aca4d72bb8aced14ca9de99bdc9a90bdaacb06c5ddd8378a66443c1d70f  docker-containerd-v1.2.1.tar.gz
 sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4	LICENSE
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index 121ef0939e..cc7ec0710e 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CONTAINERD_VERSION = v1.1.3
+DOCKER_CONTAINERD_VERSION = v1.2.1
 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
 DOCKER_CONTAINERD_LICENSE = Apache-2.0
 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
-- 
2.19.2

[Buildroot] [PATCH 1/2] runc: bump to version 1.0.0-rc6

[Thomas Petazzoni]

Hello,

On Sat, 29 Dec 2018 02:42:16 -0800, Christian Stewart wrote:
> Previously, a specific commit hash from the Docker runc.installer was used to
> determine the required runc version for the Docker Engine. This old commit hash
> used was a untagged pre-1.0.0 release of runc, closer to an earlier release
> candidate.
> 
> The runc version used in the Debian distribution is not the pinned version
> previously used by Buildroot. It is the latest release candidate. The latest
> release candidate is known to be compatible with the Docker Engine, and there is
> no justification for pinning to an older RC anymore.
> 
> This commit bumps to the latest RC, 1.0.0-rc6. A v1.0.0 is expected soon.
> 
> Signed-off-by: Christian Stewart <christian@paral.in>
> ---
>  package/runc/runc.hash | 2 +-
>  package/runc/runc.mk   | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)

Both patches applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com