docker-containerd: bump to v1.2.3
PATCH 1/4 docker-containerd: bump to v1.2.3
--- package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/docker-containerd/docker-containerd.hash +1 -1
@@ -1,3 +1,3 @@ # Computed locally -sha256 a2780aca4d72bb8aced14ca9de99bdc9a90bdaacb06c5ddd8378a66443c1d70f docker-containerd-v1.2.1.tar.gz +sha256 ff4c2ad680c9e2484e335868a54b0c1ea49d9165dd5b38b64ef7d9dacf2b96b4 docker-containerd-v1.2.3.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE
package/docker-containerd/docker-containerd.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = v1.2.1 +DOCKER_CONTAINERD_VERSION = v1.2.3 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
Signature · 1 line
2.19.2
PATCH 2/4 docker-cli: bump to v18.09.2
--- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/docker-cli/docker-cli.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 3e578406dead2fc72c4b52f77db39dc779fa8b460352116c06f1ae29219bd8c2 docker-cli-v18.09.0.tar.gz +sha256 29f3a435bfcd52dbe26f6315ee92bffc0220a537608935a2c3870f6b729fc16e docker-cli-v18.09.2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE
package/docker-cli/docker-cli.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = v18.09.0 +DOCKER_CLI_VERSION = v18.09.2 DOCKER_CLI_SITE = $(call github,docker,cli,$(DOCKER_CLI_VERSION)) DOCKER_CLI_WORKSPACE = gopath
Signature · 1 line
2.19.2
PATCH 2/4 docker-cli: bump to v18.09.2
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Christian" == Christian Stewart <[email protected]> writes:
Signed-off-by Christian Stewart <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/4 docker-engine: bump to v18.09.2
In reply to Christian Stewart--- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/docker-engine/docker-engine.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 b5278b3f2b460ea61f47833abd2a844f348b4518e73f309294ad178c205a48e1 docker-engine-v18.09.0.tar.gz +sha256 4babbcbc3e1d7750c61a1e5bee29bd206256948961feaac5b44cabb0c70a50a6 docker-engine-v18.09.2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE
package/docker-engine/docker-engine.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = v18.09.0 +DOCKER_ENGINE_VERSION = v18.09.2 DOCKER_ENGINE_SITE = $(call github,docker,engine,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0
Signature · 1 line
2.19.2
PATCH 3/4 docker-engine: bump to v18.09.2
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Christian" == Christian Stewart <[email protected]> writes:
Signed-off-by Christian Stewart <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/4 docker-engine: fix runc version check warning
In reply to Christian StewartFixes the startup warning from Docker:
failed to retrieve runc version: unknown output format: runc version commit ...
Introduces a patch to replace the faulty version detection logic in the Docker engine.
--- ...ix-faulty-runc-version-commit-scrape.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch
package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch new file +45 -0
@@ -0,0 +1,45 @@ +From 324e7be4b252c13002bca6a9d82e7b2e43664634 Mon Sep 17 00:00:00 2001 +From: Christian Stewart <[email protected]> +Date: Mon, 26 Nov 2018 22:59:32 -0800 +Subject: [PATCH] Fix faulty runc version commit scrape + +This commit replaces faulty logic to determine the runc version commit hash. + +The original logic takes the second line of the output of "runc --version" and +does not work if there are a different number of lines printed from the command +than expected. The buildroot version of runc outputs two lines instead of the +expected three, causing the error: + +unknown output format: runc version commit: ... + +This patch replaces this logic with a simple scan of the "runc --version" +output, searching for the "runc version commit" prefixed line. + +Signed-off-by: Christian Stewart <[email protected]> +--- + daemon/info_unix.go | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/daemon/info_unix.go b/daemon/info_unix.go +index 60b2f99870..688a510796 100644 +--- a/daemon/info_unix.go ++++ b/daemon/info_unix.go +@@ -32,10 +32,11 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo) + defaultRuntimeBinary := daemon.configStore.GetRuntime(v.DefaultRuntime).Path + if rv, err := exec.Command(defaultRuntimeBinary, "--version").Output(); err == nil { + parts := strings.Split(strings.TrimSpace(string(rv)), "\n") +- if len(parts) == 3 { +- parts = strings.Split(parts[1], ": ") +- if len(parts) == 2 { +- v.RuncCommit.ID = strings.TrimSpace(parts[1]) ++ for _, pt := range parts { ++ ptKv := strings.Split(pt, ":") ++ if strings.HasSuffix(strings.TrimSpace(ptKv[0]), "commit") { ++ v.RuncCommit.ID = strings.TrimSpace(ptKv[1]) ++ break + } + } + +-- +2.18.1 +
Signature · 1 line
2.19.2
PATCH 4/4 docker-engine: fix runc version check warning
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Christian" == Christian Stewart <[email protected]> writes:
Fixes the startup warning from Docker:
failed to retrieve runc version: unknown output format: runc version commit ...Introduces a patch to replace the faulty version detection logic in the Docker engine.
Signed-off-by Christian Stewart <[email protected]>
Committed, thanks.
Please submit the patch upstream.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/4 docker-engine: fix runc version check warning
Hi Peter,
Quoted 1 line · Peter Korsgaard
Please submit the patch upstream.
The patch for docker-engine no longer applies upstream, they have recently overhauled the unix version detection code.
Best,
Christian
PATCH 1/4 docker-containerd: bump to v1.2.3
In reply to Christian StewartQuoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Christian" == Christian Stewart <[email protected]> writes:
Signed-off-by Christian Stewart <[email protected]>
Given the number of fixes, I have decided to include this on master for 2019.02.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard