* [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3
@ 2019-02-12 9:35 Christian Stewart
2019-02-12 9:35 ` [Buildroot] [PATCH 2/4] docker-cli: bump to v18.09.2 Christian Stewart
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Christian Stewart @ 2019-02-12 9:35 UTC (permalink / raw)
To: buildroot
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 52bf8e03d2..cae88f40e2 100644
--- a/package/docker-containerd/docker-containerd.hash
+++ b/package/docker-containerd/docker-containerd.hash
@@ -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
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index 12f2324a8c..9088c17660 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -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
--
2.19.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/4] docker-cli: bump to v18.09.2
2019-02-12 9:35 [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3 Christian Stewart
@ 2019-02-12 9:35 ` Christian Stewart
2019-02-12 20:26 ` Peter Korsgaard
2019-02-12 9:35 ` [Buildroot] [PATCH 3/4] docker-engine: " Christian Stewart
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Christian Stewart @ 2019-02-12 9:35 UTC (permalink / raw)
To: buildroot
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/docker-cli/docker-cli.hash | 2 +-
package/docker-cli/docker-cli.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash
index 03322a4f6d..9782f34baa 100644
--- a/package/docker-cli/docker-cli.hash
+++ b/package/docker-cli/docker-cli.hash
@@ -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
diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk
index c73caa2652..c3dd536937 100644
--- a/package/docker-cli/docker-cli.mk
+++ b/package/docker-cli/docker-cli.mk
@@ -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
--
2.19.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/4] docker-engine: bump to v18.09.2
2019-02-12 9:35 [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3 Christian Stewart
2019-02-12 9:35 ` [Buildroot] [PATCH 2/4] docker-cli: bump to v18.09.2 Christian Stewart
@ 2019-02-12 9:35 ` Christian Stewart
2019-02-12 20:26 ` Peter Korsgaard
2019-02-12 9:35 ` [Buildroot] [PATCH 4/4] docker-engine: fix runc version check warning Christian Stewart
2019-02-12 20:26 ` [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3 Peter Korsgaard
3 siblings, 1 reply; 9+ messages in thread
From: Christian Stewart @ 2019-02-12 9:35 UTC (permalink / raw)
To: buildroot
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/docker-engine/docker-engine.hash | 2 +-
package/docker-engine/docker-engine.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash
index 1e3939f240..fe7b0d3b94 100644
--- a/package/docker-engine/docker-engine.hash
+++ b/package/docker-engine/docker-engine.hash
@@ -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
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index aae44ab6df..e2f59666df 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -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
--
2.19.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] docker-engine: fix runc version check warning
2019-02-12 9:35 [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3 Christian Stewart
2019-02-12 9:35 ` [Buildroot] [PATCH 2/4] docker-cli: bump to v18.09.2 Christian Stewart
2019-02-12 9:35 ` [Buildroot] [PATCH 3/4] docker-engine: " Christian Stewart
@ 2019-02-12 9:35 ` Christian Stewart
2019-02-12 20:27 ` Peter Korsgaard
2019-02-12 20:26 ` [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3 Peter Korsgaard
3 siblings, 1 reply; 9+ messages in thread
From: Christian Stewart @ 2019-02-12 9:35 UTC (permalink / raw)
To: buildroot
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 <christian@paral.in>
---
...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
diff --git a/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch b/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch
new file mode 100644
index 0000000000..dc47a8f9ef
--- /dev/null
+++ b/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch
@@ -0,0 +1,45 @@
+From 324e7be4b252c13002bca6a9d82e7b2e43664634 Mon Sep 17 00:00:00 2001
+From: Christian Stewart <christian@paral.in>
+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 <christian@paral.in>
+---
+ 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
+
--
2.19.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3
2019-02-12 9:35 [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3 Christian Stewart
` (2 preceding siblings ...)
2019-02-12 9:35 ` [Buildroot] [PATCH 4/4] docker-engine: fix runc version check warning Christian Stewart
@ 2019-02-12 20:26 ` Peter Korsgaard
3 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2019-02-12 20:26 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <christian@paral.in> writes:
> Signed-off-by: Christian Stewart <christian@paral.in>
Given the number of fixes, I have decided to include this on master for
2019.02.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/4] docker-cli: bump to v18.09.2
2019-02-12 9:35 ` [Buildroot] [PATCH 2/4] docker-cli: bump to v18.09.2 Christian Stewart
@ 2019-02-12 20:26 ` Peter Korsgaard
0 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2019-02-12 20:26 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <christian@paral.in> writes:
> Signed-off-by: Christian Stewart <christian@paral.in>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/4] docker-engine: bump to v18.09.2
2019-02-12 9:35 ` [Buildroot] [PATCH 3/4] docker-engine: " Christian Stewart
@ 2019-02-12 20:26 ` Peter Korsgaard
0 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2019-02-12 20:26 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <christian@paral.in> writes:
> Signed-off-by: Christian Stewart <christian@paral.in>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] docker-engine: fix runc version check warning
2019-02-12 9:35 ` [Buildroot] [PATCH 4/4] docker-engine: fix runc version check warning Christian Stewart
@ 2019-02-12 20:27 ` Peter Korsgaard
2019-02-13 1:13 ` Christian Stewart
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2019-02-12 20:27 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <christian@paral.in> 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 <christian@paral.in>
Committed, thanks.
Please submit the patch upstream.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] docker-engine: fix runc version check warning
2019-02-12 20:27 ` Peter Korsgaard
@ 2019-02-13 1:13 ` Christian Stewart
0 siblings, 0 replies; 9+ messages in thread
From: Christian Stewart @ 2019-02-13 1:13 UTC (permalink / raw)
To: buildroot
Hi Peter,
Peter Korsgaard <peter@korsgaard.com> writes:
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-02-13 1:13 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-12 9:35 [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3 Christian Stewart
2019-02-12 9:35 ` [Buildroot] [PATCH 2/4] docker-cli: bump to v18.09.2 Christian Stewart
2019-02-12 20:26 ` Peter Korsgaard
2019-02-12 9:35 ` [Buildroot] [PATCH 3/4] docker-engine: " Christian Stewart
2019-02-12 20:26 ` Peter Korsgaard
2019-02-12 9:35 ` [Buildroot] [PATCH 4/4] docker-engine: fix runc version check warning Christian Stewart
2019-02-12 20:27 ` Peter Korsgaard
2019-02-13 1:13 ` Christian Stewart
2019-02-12 20:26 ` [Buildroot] [PATCH 1/4] docker-containerd: bump to v1.2.3 Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.