package/docker-containerd: bump to 1.3.2
PATCH 1/2 package/docker-containerd: bump to 1.3.2
--- 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
@@ -1,3 +1,3 @@ # Computed locally -sha256 6a4192fced10c390373adfa9fa9a4f12fe9f38bde580d90468a79ed6c8af75ee docker-containerd-1.2.11.tar.gz -sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE +sha256 1ac07660f693aac0df48638090e1c528a056dbe19c4136bbe0c74fa865399b96 docker-containerd-1.3.2.tar.gz +sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE
package/docker-containerd/docker-containerd.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 1.2.11 +DOCKER_CONTAINERD_VERSION = 1.3.2 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.1
PATCH 2/2 package/docker-proxy: bump to feeff4
docker-proxy (libnetwork) has not added a release tag for a long time. Use the latest master commit hash from 09 Jan 2020 instead.
--- package/docker-proxy/docker-proxy.hash | 2 +- package/docker-proxy/docker-proxy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/docker-proxy/docker-proxy.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz +sha256 0fffcd438b9a87a7ff8315364ff4631d2241ac0cf9f9f83871aeafcb2a383fd1 docker-proxy-feeff4f0a3fd2a2bb19cf67c826082c66ffaaed9.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE
package/docker-proxy/docker-proxy.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_PROXY_VERSION = 55685ba49593e67f5e1c8180539379b16736c25e +DOCKER_PROXY_VERSION = feeff4f0a3fd2a2bb19cf67c826082c66ffaaed9 DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) DOCKER_PROXY_LICENSE = Apache-2.0
Signature · 1 line
2.24.1
PATCH 2/2 package/docker-proxy: bump to feeff4
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Christian" == Christian Stewart <[email protected]> writes:
docker-proxy (libnetwork) has not added a release tag for a long time. Use the latest master commit hash from 09 Jan 2020 instead.
Signed-off-by Christian Stewart <[email protected]>
Same comment as for docker-containerd.
I was of the understanding that docker-proxy isn't really needed any more. Can you clarify?
Quoted 34 lines
--- package/docker-proxy/docker-proxy.hash | 2 +- package/docker-proxy/docker-proxy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)package/docker-proxy/docker-proxy.hash +1
-1@@ -1,3 +1,3 @@ # Locally calculated -sha256 866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz +sha256 0fffcd438b9a87a7ff8315364ff4631d2241ac0cf9f9f83871aeafcb2a383fd1 docker-proxy-feeff4f0a3fd2a2bb19cf67c826082c66ffaaed9.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSEpackage/docker-proxy/docker-proxy.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_PROXY_VERSION = 55685ba49593e67f5e1c8180539379b16736c25e +DOCKER_PROXY_VERSION = feeff4f0a3fd2a2bb19cf67c826082c66ffaaed9 DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) DOCKER_PROXY_LICENSE = Apache-2.0Signature · 6 lines
2.24.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/docker-proxy: bump to feeff4
Hi Peter,
Quoted 2 lines · Peter Korsgaard
I was of the understanding that docker-proxy isn't really needed any more. Can you clarify?
I have build + run tested it with the latest version as built by this patch. Docker-proxy is still used in the Gentoo build files.
There's not much information online about docker-proxy, one article even claims that it should be a symlink to the docker binary itself.
The docker-proxy binary is executed when port-forwarding.
$ docker run -d -p 80:8080 nginx
Results in the following being run:
/usr/bin/docker-proxy -proto tcp -host-ip 0.0.0.0 -host-port 80 -container-ip 172.17.0.2 -container-port 8080
The binary does need to be in place, and it works fine after this version bump. I'm not sure if it could be replaced with a symlink to the docker binary itself.
Best regards,
Christian
PATCH 2/2 package/docker-proxy: bump to feeff4
Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Christian" == Christian Stewart <[email protected]> writes:
Hi Peter,
Quoted 2 lines · Peter Korsgaard
I was of the understanding that docker-proxy isn't really needed any more. Can you clarify?
I have build + run tested it with the latest version as built by this patch. Docker-proxy is still used in the Gentoo build files.
There's not much information online about docker-proxy, one article even claims that it should be a symlink to the docker binary itself.
The docker-proxy binary is executed when port-forwarding.
$ docker run -d -p 80:8080 nginx
Quoted 8 lines
Results in the following being run:
/usr/bin/docker-proxy-proto tcp -host-ip 0.0.0.0 -host-port 80 -container-ip 172.17.0.2 -container-port 8080The binary does need to be in place, and it works fine after this version bump. I'm not sure if it could be replaced with a symlink to the docker binary itself.
Ok. I am referring to references like this:
https://github.com/moby/moby/issues/14856
Which makes me think that docker-proxy should be optional rather than unconditionally selected by docker-engine.
What do you think?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/docker-proxy: bump to feeff4
Hi Peter,
Quoted 10 lines · Peter Korsgaard
Ok. I am referring to references like this:
https://github.com/moby/moby/issues/14856
Which makes me think that docker-proxy should be optional rather than unconditionally selected by docker-engine.
What do you think?
We could set --userland-proxy=false on the daemon, perhaps, and remove the docker-proxy requirement? I will do some tests on this.
I think it makes sense to first bump docker-proxy (it still is started and used with the current configuration) and then remove it later.
Best regards,
Christian
PATCH 1/2 package/docker-containerd: bump to 1.3.2
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]>
Can you provide a more detailed commit message, please?
In the past we have matched the runc and containerd versions with what upstream uses for docker-ce.
What does this bring when used with docker-engine 19.03? Is it compatible?
Quoted 35 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@@ -1,3 +1,3 @@ # Computed locally -sha256 6a4192fced10c390373adfa9fa9a4f12fe9f38bde580d90468a79ed6c8af75ee docker-containerd-1.2.11.tar.gz -sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE +sha256 1ac07660f693aac0df48638090e1c528a056dbe19c4136bbe0c74fa865399b96 docker-containerd-1.3.2.tar.gz +sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSEpackage/docker-containerd/docker-containerd.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 1.2.11 +DOCKER_CONTAINERD_VERSION = 1.3.2 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSESignature · 6 lines
2.24.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 package/docker-containerd: bump to 1.3.2
Hi Peter,
Quoted 7 lines · Peter Korsgaard
Can you provide a more detailed commit message, please?
In the past we have matched the runc and containerd versions with what upstream uses for docker-ce.
What does this bring when used with docker-engine 19.03? Is it compatible?
It's not necessary to version match them anymore, as of the recent versions they are separate projects. In fact, it may be worthwhile to rename the "docker-containerd" package to simply "containerd."
Best regards,
Christian
PATCH 1/2 package/docker-containerd: bump to 1.3.2
Hi Peter, all,
Quoted 7 lines · Christian Stewart
Quoted 7 lines
Can you provide a more detailed commit message, please?
In the past we have matched the runc and containerd versions with what upstream uses for docker-ce.
What does this bring when used with docker-engine 19.03? Is it compatible?
While this release (1.3.x) is compatible with Docker and containerd is a separate project now (and could be updated as releases are published, independently from Docker);
Docker 19.03.4 bumped their containerd reference to 1.2.10. Containerd has released a 1.2.12 release (on the 1.2.x as opposed to 1.3.x series) with bugfixes.
For now, I will withdraw this patch and re-submit one to bump to 1.2.12.
Best regards,
Christian