* [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2
@ 2020-01-10 4:50 Christian Stewart
2020-01-10 4:50 ` [Buildroot] [PATCH 2/2] package/docker-proxy: bump to feeff4 Christian Stewart
2020-01-10 8:39 ` [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2 Peter Korsgaard
0 siblings, 2 replies; 9+ messages in thread
From: Christian Stewart @ 2020-01-10 4:50 UTC (permalink / raw)
To: buildroot
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/docker-containerd/docker-containerd.hash | 4 ++--
package/docker-containerd/docker-containerd.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
index aad74089e9..e870e42996 100644
--- a/package/docker-containerd/docker-containerd.hash
+++ b/package/docker-containerd/docker-containerd.hash
@@ -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
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index 69068e44f8..90601c58fa 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -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
--
2.24.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] package/docker-proxy: bump to feeff4
2020-01-10 4:50 [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2 Christian Stewart
@ 2020-01-10 4:50 ` Christian Stewart
2020-01-10 8:40 ` Peter Korsgaard
2020-01-10 8:39 ` [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2 Peter Korsgaard
1 sibling, 1 reply; 9+ messages in thread
From: Christian Stewart @ 2020-01-10 4:50 UTC (permalink / raw)
To: buildroot
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 <christian@paral.in>
---
package/docker-proxy/docker-proxy.hash | 2 +-
package/docker-proxy/docker-proxy.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash
index 58de697929..4fa9541bed 100644
--- a/package/docker-proxy/docker-proxy.hash
+++ b/package/docker-proxy/docker-proxy.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz
+sha256 0fffcd438b9a87a7ff8315364ff4631d2241ac0cf9f9f83871aeafcb2a383fd1 docker-proxy-feeff4f0a3fd2a2bb19cf67c826082c66ffaaed9.tar.gz
sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE
diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk
index 8843266c30..67f1ae2a90 100644
--- a/package/docker-proxy/docker-proxy.mk
+++ b/package/docker-proxy/docker-proxy.mk
@@ -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
--
2.24.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2
2020-01-10 4:50 [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2 Christian Stewart
2020-01-10 4:50 ` [Buildroot] [PATCH 2/2] package/docker-proxy: bump to feeff4 Christian Stewart
@ 2020-01-10 8:39 ` Peter Korsgaard
2020-01-11 4:21 ` Christian Stewart
1 sibling, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2020-01-10 8:39 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <christian@paral.in> writes:
> Signed-off-by: Christian Stewart <christian@paral.in>
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?
> ---
> package/docker-containerd/docker-containerd.hash | 4 ++--
> package/docker-containerd/docker-containerd.mk | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
> diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
> index aad74089e9..e870e42996 100644
> --- a/package/docker-containerd/docker-containerd.hash
> +++ b/package/docker-containerd/docker-containerd.hash
> @@ -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
> diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
> index 69068e44f8..90601c58fa 100644
> --- a/package/docker-containerd/docker-containerd.mk
> +++ b/package/docker-containerd/docker-containerd.mk
> @@ -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
> --
> 2.24.1
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] package/docker-proxy: bump to feeff4
2020-01-10 4:50 ` [Buildroot] [PATCH 2/2] package/docker-proxy: bump to feeff4 Christian Stewart
@ 2020-01-10 8:40 ` Peter Korsgaard
2020-01-11 4:20 ` Christian Stewart
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2020-01-10 8:40 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <christian@paral.in> 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 <christian@paral.in>
Same comment as for docker-containerd.
I was of the understanding that docker-proxy isn't really needed any
more. Can you clarify?
> ---
> package/docker-proxy/docker-proxy.hash | 2 +-
> package/docker-proxy/docker-proxy.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash
> index 58de697929..4fa9541bed 100644
> --- a/package/docker-proxy/docker-proxy.hash
> +++ b/package/docker-proxy/docker-proxy.hash
> @@ -1,3 +1,3 @@
> # Locally calculated
> -sha256 866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz
> +sha256 0fffcd438b9a87a7ff8315364ff4631d2241ac0cf9f9f83871aeafcb2a383fd1 docker-proxy-feeff4f0a3fd2a2bb19cf67c826082c66ffaaed9.tar.gz
> sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE
> diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk
> index 8843266c30..67f1ae2a90 100644
> --- a/package/docker-proxy/docker-proxy.mk
> +++ b/package/docker-proxy/docker-proxy.mk
> @@ -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
> --
> 2.24.1
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] package/docker-proxy: bump to feeff4
2020-01-10 8:40 ` Peter Korsgaard
@ 2020-01-11 4:20 ` Christian Stewart
2020-01-11 8:31 ` Peter Korsgaard
0 siblings, 1 reply; 9+ messages in thread
From: Christian Stewart @ 2020-01-11 4:20 UTC (permalink / raw)
To: buildroot
Hi Peter,
On Fri, Jan 10, 2020 at 12:40 AM Peter Korsgaard <peter@korsgaard.com> wrote:
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2
2020-01-10 8:39 ` [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2 Peter Korsgaard
@ 2020-01-11 4:21 ` Christian Stewart
2020-02-04 23:02 ` Christian Stewart
0 siblings, 1 reply; 9+ messages in thread
From: Christian Stewart @ 2020-01-11 4:21 UTC (permalink / raw)
To: buildroot
Hi Peter,
On Fri, Jan 10, 2020 at 12:39 AM Peter Korsgaard <peter@korsgaard.com> wrote:
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] package/docker-proxy: bump to feeff4
2020-01-11 4:20 ` Christian Stewart
@ 2020-01-11 8:31 ` Peter Korsgaard
2020-02-04 23:06 ` Christian Stewart
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2020-01-11 8:31 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <christian@paral.in> writes:
> Hi Peter,
> On Fri, Jan 10, 2020 at 12:40 AM Peter Korsgaard <peter@korsgaard.com> wrote:
>> 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.
Ok. I am referring to references like this:
https://github.com/moby/moby/issues/14856
https://serverfault.com/questions/633604/what-is-the-point-of-the-docker-proxy-process-why-is-a-userspace-tcp-proxy-need
Which makes me think that docker-proxy should be optional rather than
unconditionally selected by docker-engine.
What do you think?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2
2020-01-11 4:21 ` Christian Stewart
@ 2020-02-04 23:02 ` Christian Stewart
0 siblings, 0 replies; 9+ messages in thread
From: Christian Stewart @ 2020-02-04 23:02 UTC (permalink / raw)
To: buildroot
Hi Peter, all,
Christian Stewart <christian@paral.in> writes:
>> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] package/docker-proxy: bump to feeff4
2020-01-11 8:31 ` Peter Korsgaard
@ 2020-02-04 23:06 ` Christian Stewart
0 siblings, 0 replies; 9+ messages in thread
From: Christian Stewart @ 2020-02-04 23:06 UTC (permalink / raw)
To: buildroot
Hi Peter,
Peter Korsgaard <peter@korsgaard.com> writes:
> Ok. I am referring to references like this:
>
> https://github.com/moby/moby/issues/14856
>
> https://serverfault.com/questions/633604/what-is-the-point-of-the-docker-proxy-process-why-is-a-userspace-tcp-proxy-need
>
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-02-04 23:06 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-10 4:50 [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2 Christian Stewart
2020-01-10 4:50 ` [Buildroot] [PATCH 2/2] package/docker-proxy: bump to feeff4 Christian Stewart
2020-01-10 8:40 ` Peter Korsgaard
2020-01-11 4:20 ` Christian Stewart
2020-01-11 8:31 ` Peter Korsgaard
2020-02-04 23:06 ` Christian Stewart
2020-01-10 8:39 ` [Buildroot] [PATCH 1/2] package/docker-containerd: bump to 1.3.2 Peter Korsgaard
2020-01-11 4:21 ` Christian Stewart
2020-02-04 23:02 ` Christian Stewart
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.