docker-containerd: bump to version 9048e5e50717ea4497b757314bad98ea3763c145

PATCH New Christian Stewart 3 participants 7 messages May 10, 2017 – Jun 12, 2017

lore

Share & tools

lore

Christian Stewart

author

2017-05-10 04:00 UTC #0 lore raw

PATCH 1/2 docker-containerd: bump to version 9048e5e50717ea4497b757314bad98ea3763c145

This is a runtime dependency of docker-engine in version 17.05.0-ce

Signed-off-by Christian Stewart <[email protected]>

---
 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

index a161f3b..992eb5b 100644
@@ -1,2 +1,2 @@
 # Computed locally
-sha256	8223d934fa767fcabf45c734bdb616818a5eab8c95d525de6a69a350f4aeb826	docker-containerd-422e31ce907fd9c3833a38d7b8fdd023e5a76e73.tar.gz
+sha256	da89086a7c643702a2ddecec67a45d3d8e4b0d610dd19036be63e6bd54cc1a85	docker-containerd-9048e5e50717ea4497b757314bad98ea3763c145.tar.gz

package/docker-containerd/docker-containerd.mk +1 -1

index c0b0012..bf3e32d 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CONTAINERD_VERSION = 422e31ce907fd9c3833a38d7b8fdd023e5a76e73
+DOCKER_CONTAINERD_VERSION = 9048e5e50717ea4497b757314bad98ea3763c145
 DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION))
 DOCKER_CONTAINERD_LICENSE = Apache-2.0
 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code

Signature · 1 line

2.10.2

Christian Stewart

author

2017-05-10 04:00 UTC #1 lore raw

PATCH 2/2 docker-engine: bump to version 17.05.0-ce

Signed-off-by Christian Stewart <[email protected]>

---
 package/docker-engine/docker-engine.hash | 2 +-
 package/docker-engine/docker-engine.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

package/docker-engine/docker-engine.hash +1 -1

index aa7c3ac..6c0ed33 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	b6ee0aa93ecea44e956d3627907e10557b3ec37d13ddfb40e436656e5037c640	docker-engine-v17.04.0-ce.tar.gz
+sha256	4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121	docker-engine-v17.05.0-ce.tar.gz

package/docker-engine/docker-engine.mk +2 -2

index c4c1157..831b586 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-DOCKER_ENGINE_VERSION = v17.04.0-ce
-DOCKER_ENGINE_COMMIT = 4845c567eb35d68f35b0b1713a09b0c8d47fe67e
+DOCKER_ENGINE_VERSION = v17.05.0-ce
+DOCKER_ENGINE_COMMIT = 89658bed64c2a8fe05a978e5b87dbec409d57a0f
 DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))
 
 DOCKER_ENGINE_LICENSE = Apache-2.0

Signature · 1 line

2.10.2

Fabrice Fontaine

2017-05-10 07:23 UTC #2 lore raw

PATCH 2/2 docker-engine: bump to version 17.05.0-ce

Dear Christian and all,

2017-05-10 6:00 GMT+02:00 Christian Stewart <[email protected]>:

Quoted 24 lines

Signed-off-by Christian Stewart <[email protected]>

---
 package/docker-engine/docker-engine.hash | 2 +-
 package/docker-engine/docker-engine.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

package/docker-engine/docker-engine.hash +1 -1

index aa7c3ac..6c0ed33 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 b6ee0aa93ecea44e956d3627907e10557b3ec37d13ddfb40e436656e5037c640
      docker-engine-v17.04.0-ce.tar.gz
+sha256 4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121
      docker-engine-v17.05.0-ce.tar.gz

package/docker-engine/docker-engine.mk +0 -0

index c4c1157..831b586 100644

package/docker-engine/docker-engine.mk line 11

Quoted 10 lines

package/docker-engine/docker-engine.mk +2 -2

@@ -4,8 +4,8 @@
 #
 ############################################################
 ####################
 
-DOCKER_ENGINE_VERSION = v17.04.0-ce
-DOCKER_ENGINE_COMMIT = 4845c567eb35d68f35b0b1713a09b0c8d47fe67e
+DOCKER_ENGINE_VERSION = v17.05.0-ce
+DOCKER_ENGINE_COMMIT = 89658bed64c2a8fe05a978e5b87dbec409d57a0f
 DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_
 ENGINE_VERSION))

Since April 18th (and so starting from this release), docker has been renamed "moby": https://blog.docker.com/2017/04/introducing-the-moby-project
.
So, I would suggest to rename the docker-engine package to moby package, update the repo and website URLs.
What's your opinion about this proposal? Do you think it's too early and we should keep docker-engine for the time being?
If you agree, I would also suggest to rename docker-containerd to containerd as containerd has now its own repository and website (
https://containerd.io)

Quoted 6 lines

DOCKER_ENGINE_LICENSE = Apache-2.0
--
2.10.2

Best Regards,

Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170510/ff82cb75/attachment.html>

Christian Stewart

author

2017-05-10 18:08 UTC #3 lore raw

PATCH 2/2 docker-engine: bump to version 17.05.0-ce

Hi Fabrice, All,

Quoted 2 lines · Fabrice Fontaine

Since April 18th (and so starting from this release), docker has been renamed "moby":

That's not actually true, it's still called Docker Community Edition, which is why everyone's so confused. The CLI is called docker, the system is Docker, everything is still Docker, the distribution is docker-ce, the Go imports all point to docker/docker.

They are introducing "moby" as a name for a collection of components that when assembled together form Docker. It's still appropriate to call the package docker-engine, and as such I do not recommend we rename it at this time. Moby will be a new CLI used in development to assemble these components together, or so they say.

Quoted 2 lines

If you agree, I would also suggest to rename docker-containerd to containerd as containerd has now its own repository and website (https://containerd.io)

Yes, we should do this. However, I recommend we take the following steps:

- Apply this series now, and try to get it into the next buildroot
release as it's a bugfix and general release of Docker corresponding with this Buildroot release (2017.05).
- In next, rename docker-containerd to containerd, and have the
docker-engine package simlink /usr/bin/docker-containerd to /usr/bin/containerd, as is done in my other patch series introducing docker-init. I am happy to supply the series to do this change.

Thoughts?

Best,
Christian Stewart

Christian Stewart

author

2017-05-26 00:27 UTC #4 lore raw

PATCH 2/2 docker-engine: bump to version 17.05.0-ce

Hi Fabrice, All,

Quoted 6 lines · Christian Stewart

Quoted 2 lines · Fabrice Fontaine
Since April 18th (and so starting from this release), docker has been renamed "moby":
I recommend we take the following steps:

Quoted 7 lines

- Apply this series now, and try to get it into the next buildroot
release as it's a bugfix and general release of Docker corresponding with this Buildroot release (2017.05).
- In next, rename docker-containerd to containerd, and have the
docker-engine package simlink /usr/bin/docker-containerd to /usr/bin/containerd, as is done in my other patch series introducing docker-init. I am happy to supply the series to do this change.

Things have settled a little bit:

- Docker CLI has been moved to https://github.com/docker/cli
- Dockerd remains in https://github.com/moby/moby under cmd/dockerd

We should still wait until Docker spins their next release, or their next rc, before we can really tell what the build process will look like for the Docker client and daemon. It's likely that the package needs to be split into multiple - one for the client, one for the daemon, etc.

I would recommend still merging this series immediately - everything still works here and will forever (according to the Docker project's guarantees) and it's important to get the latest version merged into Buildroot before we go about splitting these packages up in the future.

Thanks!
Christian Stewart

Fabrice Fontaine

2017-05-29 07:53 UTC #5 lore raw

PATCH 2/2 docker-engine: bump to version 17.05.0-ce

Dear Christian,

2017-05-26 2:27 GMT+02:00 Christian Stewart <[email protected]>:

Quoted 29 lines

Hi Fabrice, All,
Quoted 6 lines · Christian Stewart
Quoted 2 lines · Fabrice Fontaine
Since April 18th (and so starting from this release), docker has been renamed "moby":
I recommend we take the following steps:
Quoted 7 lines
- Apply this series now, and try to get it into the next buildroot
release as it's a bugfix and general release of Docker corresponding with this Buildroot release (2017.05).
- In next, rename docker-containerd to containerd, and have the
docker-engine package simlink /usr/bin/docker-containerd to /usr/bin/containerd, as is done in my other patch series introducing docker-init. I am happy to supply the series to do this change.
Things have settled a little bit:
- Docker CLI has been moved to https://github.com/docker/cli
- Dockerd remains in https://github.com/moby/moby under cmd/dockerd
We should still wait until Docker spins their next release, or their next rc, before we can really tell what the build process will look like for the Docker client and daemon. It's likely that the package needs to be split into multiple - one for the client, one for the daemon, etc.

Quoted 6 lines

I would recommend still merging this series immediately - everything still works here and will forever (according to the Docker project's guarantees) and it's important to get the latest version merged into Buildroot before we go about splitting these packages up in the future.

I agree with your proposal.

Quoted 4 lines

Thanks!
Christian Stewart

Best Regards,

Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170529/48b95750/attachment.html>

Thomas Petazzoni

Applied

2017-06-12 08:11 UTC #6 lore raw

PATCH 1/2 docker-containerd: bump to version 9048e5e50717ea4497b757314bad98ea3763c145

In reply to Christian Stewart

Hello,

Quoted 7 lines · Christian Stewart

This is a runtime dependency of docker-engine in version 17.05.0-ce
Signed-off-by Christian Stewart <[email protected]>
---
 package/docker-containerd/docker-containerd.hash | 2 +-
 package/docker-containerd/docker-containerd.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com