Skip to contentSkip to conversation

package/runc: bump to 1.0.0-rc9

PATCH New Christian Stewart 3 participants 21 messages Dec 3, 2019 – Jan 10, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 package/runc: bump to 1.0.0-rc9

---
 package/runc/runc.hash | 2 +-
 package/runc/runc.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/runc/runc.hash +1 -1
index 4f663affc4..3e8eff3cca 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256	efe4ff9bbe49b19074346d65c914d809c0a3e90d062ea9619fe240f931f0b700  runc-1.0.0-rc8.tar.gz
+sha256	2ec69c25df9f02c6fd38eb287145f8afba6772f809abe01df4534b5bfd68e8d4  runc-1.0.0-rc9.tar.gz
 sha256  552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243  LICENSE
package/runc/runc.mk +1 -1
index b858742905..acf61ab160 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RUNC_VERSION = 1.0.0-rc8
+RUNC_VERSION = 1.0.0-rc9
 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION))
 RUNC_LICENSE = Apache-2.0
 RUNC_LICENSE_FILES = LICENSE
Signature · 1 line
2.24.0
#1 lore raw

PATCH 2/4 package/docker-containerd: bump to 1.2.11

---
 package/docker-containerd/docker-containerd.hash | 4 ++--
 package/docker-containerd/docker-containerd.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/docker-containerd/docker-containerd.hash +2 -2
index 2e275dd81e..aad74089e9 100644
@@ -1,3 +1,3 @@
 # Computed locally
-sha256	f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891  docker-containerd-1.2.6.tar.gz
-sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4	LICENSE
+sha256	6a4192fced10c390373adfa9fa9a4f12fe9f38bde580d90468a79ed6c8af75ee  docker-containerd-1.2.11.tar.gz
+sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE
package/docker-containerd/docker-containerd.mk +1 -1
index 22480d1df8..69068e44f8 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CONTAINERD_VERSION = 1.2.6
+DOCKER_CONTAINERD_VERSION = 1.2.11
 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION))
 DOCKER_CONTAINERD_LICENSE = Apache-2.0
 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
Signature · 1 line
2.24.0
#2 lore raw

PATCH 2/4 package/docker-containerd: bump to 1.2.11

Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

I don't really understand the relation between containerd and runc, but containerd seems to bundle runc? If we backport runc to 2019.02.x do we then also need to backport containerd?

Quoted 30 lines
---
 package/docker-containerd/docker-containerd.hash | 4 ++--
 package/docker-containerd/docker-containerd.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/docker-containerd/docker-containerd.hash +2 -2
index 2e275dd81e..aad74089e9 100644
@@ -1,3 +1,3 @@
 # Computed locally
-sha256	f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891  docker-containerd-1.2.6.tar.gz
-sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4	LICENSE
+sha256	6a4192fced10c390373adfa9fa9a4f12fe9f38bde580d90468a79ed6c8af75ee  docker-containerd-1.2.11.tar.gz
+sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE
package/docker-containerd/docker-containerd.mk +1 -1
index 22480d1df8..69068e44f8 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CONTAINERD_VERSION = 1.2.6
+DOCKER_CONTAINERD_VERSION = 1.2.11
 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION))
 DOCKER_CONTAINERD_LICENSE = Apache-2.0
 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
Signature · 1 line
2.24.0
Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 2/4 package/docker-containerd: bump to 1.2.11

Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"Christian" == Christian Stewart <[email protected]> writes:

Committed after updating the commit message to clarify that this is a security bump, thanks.

Committed to 2019.02.x and 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 3/4 package/docker-engine: bump to 19.03.5

In reply to Christian Stewart
---
 ...ix-faulty-runc-version-commit-scrape.patch | 45 -------------------
 package/docker-engine/docker-engine.hash      |  2 +-
 package/docker-engine/docker-engine.mk        |  2 +-
 3 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch
package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch deleted +0 -45
deleted file mode 100644
index dc47a8f9ef..0000000000
@@ -1,45 +0,0 @@
-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
-
package/docker-engine/docker-engine.hash +1 -1
index b89310f993..59c9204285 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	fa3a9e998627418d648495d06d168c4d26ed07859c9370d5fddbfd29c26d8592  docker-engine-18.09.9.tar.gz
+sha256	bc5d1ac503e44593be8003ed0ad9c75bf0da535db19837a9338429c438bd4637  docker-engine-19.03.5.tar.gz
 sha256	2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0  LICENSE
package/docker-engine/docker-engine.mk +1 -1
index 6a225ee5f0..24022f7107 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_ENGINE_VERSION = 18.09.9
+DOCKER_ENGINE_VERSION = 19.03.5
 DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION))
 
 DOCKER_ENGINE_LICENSE = Apache-2.0
Signature · 1 line
2.24.0
#6 lore raw

PATCH 3/4 package/docker-engine: bump to 19.03.5

Hello Christian,

Quoted 7 lines · On Mon, 2 Dec 2019 20:50:02 -0800 Christian Stewart <[email protected]> wrote:
---
 ...ix-faulty-runc-version-commit-scrape.patch | 45 -------------------
 package/docker-engine/docker-engine.hash      |  2 +-
 package/docker-engine/docker-engine.mk        |  2 +-
 3 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch

A quick question: did you check that the test_docker_compose.py test we have in Buildroot continues to work with this series applied ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#7 lore raw

PATCH 3/4 package/docker-engine: bump to 19.03.5

Hi Thomas,

Quoted 3 lines · Thomas Petazzoni

A quick question: did you check that the test_docker_compose.py test we have in Buildroot continues to work with this series applied ?

Where can I find some documentation on how to run this script on the target? I tried without success.

Best regards,
Christian

#8 lore raw

PATCH 3/4 package/docker-engine: bump to 19.03.5

Quoted 5 lines · On Tue, 3 Dec 2019 18:18:21 -0800 Christian Stewart <[email protected]> wrote:
Quoted 2 lines

A quick question: did you check that the test_docker_compose.py test we have in Buildroot continues to work with this series applied ?

Where can I find some documentation on how to run this script on the target? I tried without success.

The runtime tests do not run on the target, they run on your build
machine: they build a specific Buildroot configuration, boot it under Qemu, and verifies that a number of things work properly.

To run it:

./support/testing/run-tests -k tests.package.test_docker_compose.TestDockerCompose

The -k option asks run-tests to keep the build directory around, so that if the test fails, you can easily re-run it without having to rebuild everything.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#9 lore raw

PATCH 3/4 package/docker-engine: bump to 19.03.5

Hi Thomas,

Quoted 5 lines · Thomas Petazzoni
Quoted 2 lines · On Tue, 3 Dec 2019 18:18:21 -0800 Christian Stewart <[email protected]> wrote:
Quoted 2 lines

A quick question: did you check that the test_docker_compose.py test we have in Buildroot continues to work with this series applied ?

I have now and they passed.

Quoted 3 lines

To run it:

./support/testing/run-tests -k tests.package.test_docker_compose.TestDockerCompose

# 14:44:09 TestDockerCompose Cleaning up
.
----------------------------------------------------------------------
Ran 1 test in 51.830s

OK

Best regards,
Christian

#10 lore raw

PATCH 3/4 package/docker-engine: bump to 19.03.5

In reply to Christian Stewart
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

 ...ix-faulty-runc-version-commit-scrape.patch | 45 -------------------
 package/docker-engine/docker-engine.hash      |  2 +-
 package/docker-engine/docker-engine.mk        |  2 +-
 3 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch

Next to the text cases pointed out by Thomas, a more detailed commit message would be great - E.G. what happened to your patch that you are now dropping? Did it get applied upstream? Is it no longer needed? If so, why?

Signature · 1 line
Bye, Peter Korsgaard
#11 lore raw

PATCH 3/4 package/docker-engine: bump to 19.03.5

Hi Peter,

Quoted 7 lines · Peter Korsgaard
Quoted 2 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

 delete mode 100644 package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch

Next to the text cases pointed out by Thomas, a more detailed commit message would be great - E.G. what happened to your patch that you are now dropping? Did it get applied upstream? Is it no longer needed? If so, why?

It's a really minor patch, I don't think anyone would care really that it was dropped. I will be sure to mention it in future commit messages (or if I need to submit a revision for this).

Quoted 3 lines

I don't really understand the relation between containerd and runc, but containerd seems to bundle runc? If we backport runc to 2019.02.x do we then also need to backport containerd?

The "runc" package in Buildroot compiles the userspace binary "runc" which is called by "containerd" at runtime to start namespaced processes (aka containers). "runc" means "run container."

The "runc" version referenced in containerd is the client for the runc binary and the interfaces between. Matching the expected versions to each other is necessary but security releases should be compatible.

Quoted 3 lines

According to https://github.com/opencontainers/runc/releases, this is a security bump so it should be marked as such and we presumably want to backport it to 2019.02.x even though that uses docker 18.09?

Not sure on this one.

Best regards,
Christian

#12 lore raw

PATCH 3/4 package/docker-engine: bump to 19.03.5

In reply to Christian Stewart
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

---
 ...ix-faulty-runc-version-commit-scrape.patch | 45 -------------------
 package/docker-engine/docker-engine.hash      |  2 +-
 package/docker-engine/docker-engine.mk        |  2 +-
 3 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch

Committed after updating the commit message to clarify that this is a security bump, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#13 lore raw

PATCH 3/4 package/docker-engine: bump to 19.03.5

Quoted 11 lines
Quoted 10 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"Christian" == Christian Stewart <[email protected]> writes:

---

...ix-faulty-runc-version-commit-scrape.patch | 45 -------------------
package/docker-engine/docker-engine.hash      |  2 +-
package/docker-engine/docker-engine.mk        |  2 +-
3 files changed, 2 insertions(+), 47 deletions(-)

delete mode 100644 package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch

Quoted 2 lines

Committed after updating the commit message to clarify that this is a security bump, thanks.

Committed to 2019.02.x and 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#15 lore raw

PATCH 4/4 package/docker-cli: bump to 19.03.5

In reply to Christian Stewart
---
 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
index 061e611735..44f13c8bfc 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  cef3f9e8615cde906619f7ab021655a8b974d1b497ce0e5787b1afccbeabb08d  docker-cli-18.09.9.tar.gz
+sha256	00d06baf4793794c0fd9ecad5b7e95aed6eb942f24c8b6e2d7c7f7564b9743ad  docker-cli-19.03.5.tar.gz
 sha256	2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0  LICENSE
package/docker-cli/docker-cli.mk +1 -1
index 201d782e1d..4ad30e0278 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CLI_VERSION = 18.09.9
+DOCKER_CLI_VERSION = 19.03.5
 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION))
 DOCKER_CLI_WORKSPACE = gopath
 
Signature · 1 line
2.24.0
#18 lore raw

PATCH 1/4 package/runc: bump to 1.0.0-rc9

In reply to Christian Stewart
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

According to https://github.com/opencontainers/runc/releases, this is a security bump so it should be marked as such and we presumably want to backport it to 2019.02.x even though that uses docker 18.09?

Quoted 29 lines
---
 package/runc/runc.hash | 2 +-
 package/runc/runc.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/runc/runc.hash +1 -1
index 4f663affc4..3e8eff3cca 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256	efe4ff9bbe49b19074346d65c914d809c0a3e90d062ea9619fe240f931f0b700  runc-1.0.0-rc8.tar.gz
+sha256	2ec69c25df9f02c6fd38eb287145f8afba6772f809abe01df4534b5bfd68e8d4  runc-1.0.0-rc9.tar.gz
 sha256  552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243  LICENSE
package/runc/runc.mk +1 -1
index b858742905..acf61ab160 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RUNC_VERSION = 1.0.0-rc8
+RUNC_VERSION = 1.0.0-rc9
 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION))
 RUNC_LICENSE = Apache-2.0
 RUNC_LICENSE_FILES = LICENSE
Signature · 1 line
2.24.0
Signature · 1 line
Bye, Peter Korsgaard