* [Buildroot] [PATCH 02/12] tini: new package
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-21 13:49 ` Thomas Petazzoni
2017-10-19 0:22 ` [Buildroot] [PATCH 03/12] docker-engine: add support for init processes Christian Stewart
` (11 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
Tini is a minimal init process to act as PID 1 for containers.
Tini can be used to satisfy docker-engine's docker-init binary
requirement.
In many cases docker-init backing processes like Tini must be static, as
they are executed inside a container in an unknown environment. This
patch adds an option to specifically compile Tini statically, even if
the system is compiled dynamically.
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/Config.in | 1 +
package/tini/Config.in | 21 +++++++++++++++++++++
package/tini/tini.hash | 2 ++
package/tini/tini.mk | 42 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 66 insertions(+)
create mode 100644 package/tini/Config.in
create mode 100644 package/tini/tini.hash
create mode 100644 package/tini/tini.mk
diff --git a/package/Config.in b/package/Config.in
index c161634daf..f8f9f39167 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1878,6 +1878,7 @@ comment "Utilities"
source "package/sudo/Config.in"
source "package/terminology/Config.in"
source "package/time/Config.in"
+ source "package/tini/Config.in"
source "package/tmux/Config.in"
source "package/which/Config.in"
source "package/xmlstarlet/Config.in"
diff --git a/package/tini/Config.in b/package/tini/Config.in
new file mode 100644
index 0000000000..323b9d17a1
--- /dev/null
+++ b/package/tini/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_TINI
+ bool "tini"
+ help
+ tini is a simple but valid init binary to
+ act as PID 1 for containers.
+
+ https://github.com/krallin/tini
+
+if BR2_PACKAGE_TINI
+
+config BR2_PACKAGE_TINI_MINIMAL
+ bool "build minimal variant"
+ help
+ Disables argument parsing and verbose output.
+
+config BR2_PACKAGE_TINI_STATIC
+ bool "build static"
+ help
+ Enables static compilation for tini.
+
+endif
diff --git a/package/tini/tini.hash b/package/tini/tini.hash
new file mode 100644
index 0000000000..f8c8c2a3aa
--- /dev/null
+++ b/package/tini/tini.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 c2b7fe2fb92e71911d06b7571b53d4e7e8985b34efe2a599670b070b000c8dbe tini-v0.16.1.tar.gz
diff --git a/package/tini/tini.mk b/package/tini/tini.mk
new file mode 100644
index 0000000000..a43f3f0162
--- /dev/null
+++ b/package/tini/tini.mk
@@ -0,0 +1,42 @@
+################################################################################
+#
+# tini
+#
+################################################################################
+
+TINI_VERSION = v0.16.1
+TINI_SITE = $(call github,krallin,tini,$(TINI_VERSION))
+
+TINI_LICENSE = MIT
+TINI_LICENSE_FILES = LICENSE
+
+TINI_CFLAGS = $(TARGET_CFLAGS) -DTINI_VERSION=\"$(TINI_VERSION)\" -DTINI_GIT=\"\"
+
+ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y)
+TINI_CFLAGS += -DTINI_MINIMAL
+endif
+
+ifeq ($(BR2_PACKAGE_TINI_STATIC),y)
+TINI_CFLAGS += -static
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y)
+TINI_CFLAGS += -fstack-protector --param=ssp-buffer-size=4
+endif
+
+define TINI_CONFIGURE_CMDS
+ printf "#pragma once\n" > $(@D)/src/tiniConfig.h
+endef
+
+define TINI_BUILD_CMDS
+ $(TARGET_CC) \
+ $(TINI_CFLAGS) \
+ -o $(@D)/tini $(@D)/src/tini.c
+endef
+
+define TINI_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/tini $(TARGET_DIR)/usr/bin/tini
+endef
+
+# Tini's CMakeLists.txt is not suitable for Buildroot.
+$(eval $(generic-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 02/12] tini: new package
2017-10-19 0:22 ` [Buildroot] [PATCH 02/12] tini: " Christian Stewart
@ 2017-10-21 13:49 ` Thomas Petazzoni
2017-10-24 3:06 ` Christian Stewart
0 siblings, 1 reply; 29+ messages in thread
From: Thomas Petazzoni @ 2017-10-21 13:49 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 18 Oct 2017 20:22:47 -0400, Christian Stewart wrote:
> +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y)
> +TINI_CFLAGS += -fstack-protector --param=ssp-buffer-size=4
> +endif
I don't think we want this. Buildroot already passes -fstack-protector
globally when BR2_SSP_REGULAR / BR2_SSP_STRONG / BR2_SSP_ALL.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 02/12] tini: new package
2017-10-21 13:49 ` Thomas Petazzoni
@ 2017-10-24 3:06 ` Christian Stewart
0 siblings, 0 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-24 3:06 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Sat, Oct 21, 2017 at 9:49 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> I don't think we want this. Buildroot already passes -fstack-protector
> globally when BR2_SSP_REGULAR / BR2_SSP_STRONG / BR2_SSP_ALL.
Feel free to disable it, I was copying the build flags from the
project's Makefile.
Best,
Christian
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 03/12] docker-engine: add support for init processes
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
2017-10-19 0:22 ` [Buildroot] [PATCH 02/12] tini: " Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-21 13:51 ` Yann E. MORIN
2017-10-21 13:51 ` Thomas Petazzoni
2017-10-19 0:22 ` [Buildroot] [PATCH 04/12] docker-engine: select static for tini and dumb-init Christian Stewart
` (10 subsequent siblings)
12 siblings, 2 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
When a docker container is run with the --init flag, the Docker engine
uses the docker-init binary as PID 1 inside the container. This is
necessary in may cases to avoid issues with signal handling, zombie
processes, and other quirks when running as PID 1.
The docker-init binary is backed by tini on default, but optionally can
be changed to docker-init by user preference.
Furthermore, this patch fixes the following Docker error:
dockerd: level=warning msg="failed to retrieve docker-init version"
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/docker-engine/Config.in | 26 ++++++++++++++++++++++++++
package/docker-engine/docker-engine.mk | 11 +++++++++++
2 files changed, 37 insertions(+)
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 05670a716e..7d9a87f7bb 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -33,6 +33,32 @@ config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT
if BR2_PACKAGE_DOCKER_ENGINE_DAEMON
+choice
+ bool "docker-init to use"
+ default BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI
+ help
+ The docker engine uses a minimal init process as PID 1
+ inside containers. There are several implementations
+ of this init process.
+
+config BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI
+ bool "tini"
+ select BR2_PACKAGE_TINI
+ help
+ Use Tini as the container init process.
+
+ https://github.com/krallin/tini
+
+config BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT
+ bool "dumb-init"
+ select BR2_PACKAGE_DUMB_INIT
+ help
+ Use dumb-init as the container init process.
+
+ https://github.com/Yelp/dumb-init
+
+endchoice
+
config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
bool "btrfs filesystem driver"
depends on BR2_USE_MMU # btrfs-progs
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index 8928f072e7..a2776ed78c 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -50,6 +50,13 @@ endif
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
DOCKER_ENGINE_BUILD_TAGS += daemon
DOCKER_ENGINE_BUILD_TARGETS += dockerd
+
+ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT),y)
+DOCKER_ENGINE_INIT = dumb-init
+else
+DOCKER_ENGINE_INIT = tini
+endif
+
endif
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y)
@@ -119,6 +126,10 @@ define DOCKER_ENGINE_INSTALL_TARGET_CMDS
$(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \
$(INSTALL) -D -m 0755 $(@D)/bin/$(target) $(TARGET_DIR)/usr/bin/$(target)
)
+
+ $(if $(filter $(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y), \
+ ln -fs $(DOCKER_ENGINE_INIT) $(TARGET_DIR)/usr/bin/docker-init
+ )
endef
$(eval $(generic-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 03/12] docker-engine: add support for init processes
2017-10-19 0:22 ` [Buildroot] [PATCH 03/12] docker-engine: add support for init processes Christian Stewart
@ 2017-10-21 13:51 ` Yann E. MORIN
2017-10-24 3:28 ` Christian Stewart
2017-10-21 13:51 ` Thomas Petazzoni
1 sibling, 1 reply; 29+ messages in thread
From: Yann E. MORIN @ 2017-10-21 13:51 UTC (permalink / raw)
To: buildroot
Christian, All,
On 2017-10-18 20:22 -0400, Christian Stewart spake thusly:
> When a docker container is run with the --init flag, the Docker engine
> uses the docker-init binary as PID 1 inside the container. This is
> necessary in may cases to avoid issues with signal handling, zombie
> processes, and other quirks when running as PID 1.
>
> The docker-init binary is backed by tini on default, but optionally can
> be changed to docker-init by user preference.
>
> Furthermore, this patch fixes the following Docker error:
>
> dockerd: level=warning msg="failed to retrieve docker-init version"
>
> Signed-off-by: Christian Stewart <christian@paral.in>
> ---
> package/docker-engine/Config.in | 26 ++++++++++++++++++++++++++
> package/docker-engine/docker-engine.mk | 11 +++++++++++
> 2 files changed, 37 insertions(+)
>
> diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
> index 05670a716e..7d9a87f7bb 100644
> --- a/package/docker-engine/Config.in
> +++ b/package/docker-engine/Config.in
> @@ -33,6 +33,32 @@ config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT
>
> if BR2_PACKAGE_DOCKER_ENGINE_DAEMON
>
> +choice
> + bool "docker-init to use"
> + default BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI
> + help
> + The docker engine uses a minimal init process as PID 1
> + inside containers. There are several implementations
> + of this init process.
> +
> +config BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI
> + bool "tini"
> + select BR2_PACKAGE_TINI
> + help
> + Use Tini as the container init process.
> +
> + https://github.com/krallin/tini
> +
> +config BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT
> + bool "dumb-init"
> + select BR2_PACKAGE_DUMB_INIT
> + help
> + Use dumb-init as the container init process.
> +
> + https://github.com/Yelp/dumb-init
> +
> +endchoice
> +
> config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
> bool "btrfs filesystem driver"
> depends on BR2_USE_MMU # btrfs-progs
> diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
> index 8928f072e7..a2776ed78c 100644
> --- a/package/docker-engine/docker-engine.mk
> +++ b/package/docker-engine/docker-engine.mk
> @@ -50,6 +50,13 @@ endif
> ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
> DOCKER_ENGINE_BUILD_TAGS += daemon
> DOCKER_ENGINE_BUILD_TARGETS += dockerd
> +
> +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT),y)
> +DOCKER_ENGINE_INIT = dumb-init
> +else
> +DOCKER_ENGINE_INIT = tini
> +endif
> +
> endif
>
> ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y)
> @@ -119,6 +126,10 @@ define DOCKER_ENGINE_INSTALL_TARGET_CMDS
> $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \
> $(INSTALL) -D -m 0755 $(@D)/bin/$(target) $(TARGET_DIR)/usr/bin/$(target)
> )
> +
> + $(if $(filter $(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y), \
Why not:
$(if $(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),\
ln -fs $(DOCKER_ENGINE_INIT) $(TARGET_DIR)/usr/bin/docker-init
)
Regards,
Yann E. MORIN.
> + ln -fs $(DOCKER_ENGINE_INIT) $(TARGET_DIR)/usr/bin/docker-init
> + )
> endef
>
> $(eval $(generic-package))
> --
> 2.13.6
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 03/12] docker-engine: add support for init processes
2017-10-19 0:22 ` [Buildroot] [PATCH 03/12] docker-engine: add support for init processes Christian Stewart
2017-10-21 13:51 ` Yann E. MORIN
@ 2017-10-21 13:51 ` Thomas Petazzoni
2017-10-24 3:29 ` Christian Stewart
1 sibling, 1 reply; 29+ messages in thread
From: Thomas Petazzoni @ 2017-10-21 13:51 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 18 Oct 2017 20:22:48 -0400, Christian Stewart wrote:
> When a docker container is run with the --init flag, the Docker engine
> uses the docker-init binary as PID 1 inside the container. This is
> necessary in may cases to avoid issues with signal handling, zombie
> processes, and other quirks when running as PID 1.
>
> The docker-init binary is backed by tini on default, but optionally can
> be changed to docker-init by user preference.
Did you meant "dump-init" here instead of "docker-init" ?
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 03/12] docker-engine: add support for init processes
2017-10-21 13:51 ` Thomas Petazzoni
@ 2017-10-24 3:29 ` Christian Stewart
2017-10-24 21:31 ` Arnout Vandecappelle
0 siblings, 1 reply; 29+ messages in thread
From: Christian Stewart @ 2017-10-24 3:29 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Sat, Oct 21, 2017 at 9:51 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Did you meant "dump-init" here instead of "docker-init" ?
No, definitely not.
Best,
Christian
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 03/12] docker-engine: add support for init processes
2017-10-24 3:29 ` Christian Stewart
@ 2017-10-24 21:31 ` Arnout Vandecappelle
2017-10-24 23:55 ` Christian Stewart
0 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2017-10-24 21:31 UTC (permalink / raw)
To: buildroot
On 24-10-17 05:29, Christian Stewart wrote:
> Hi Thomas,
>
> On Sat, Oct 21, 2017 at 9:51 AM, Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com> wrote:
>> Did you meant "dump-init" here instead of "docker-init" ?
>
> No, definitely not.
I think you did. You had written
The docker-init binary is backed by tini on default, but optionally can
be changed to docker-init by user preference.
so that would mean that the docker-init binary can be backed by docker-init...
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 03/12] docker-engine: add support for init processes
2017-10-24 21:31 ` Arnout Vandecappelle
@ 2017-10-24 23:55 ` Christian Stewart
0 siblings, 0 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-24 23:55 UTC (permalink / raw)
To: buildroot
Hi Arnout,
On Tue, Oct 24, 2017, 5:31 PM Arnout Vandecappelle <arnout@mind.be> wrote:
> On 24-10-17 05:29, Christian Stewart wrote:
> > On Sat, Oct 21, 2017 at 9:51 AM, Thomas Petazzoni
> > <thomas.petazzoni@free-electrons.com> wrote:
> >> Did you meant "dump-init" here instead of "docker-init" ?
> >
> > No, definitely not.
>
> I think you did. You had written
>
Definitely not "dump" init. Yes, I did mean dumb-init and just misspelled
it the first time.
Best,
Christian
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20171024/38155870/attachment.html>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 04/12] docker-engine: select static for tini and dumb-init
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
2017-10-19 0:22 ` [Buildroot] [PATCH 02/12] tini: " Christian Stewart
2017-10-19 0:22 ` [Buildroot] [PATCH 03/12] docker-engine: add support for init processes Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-19 0:22 ` [Buildroot] [PATCH 05/12] docker-proxy: new package Christian Stewart
` (9 subsequent siblings)
12 siblings, 0 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
In many cases docker-init backing processes like Tini and dumb-init must
be static, as they are executed inside a container in an unknown
environment. This patch selects the static compilation options on both
packages when used as docker-init backing processes.
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/docker-engine/Config.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 7d9a87f7bb..47ac7f57a3 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -44,6 +44,7 @@ choice
config BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI
bool "tini"
select BR2_PACKAGE_TINI
+ select BR2_PACKAGE_TINI_STATIC
help
Use Tini as the container init process.
@@ -52,6 +53,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI
config BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT
bool "dumb-init"
select BR2_PACKAGE_DUMB_INIT
+ select BR2_PACKAGE_DUMB_INIT_STATIC
help
Use dumb-init as the container init process.
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 05/12] docker-proxy: new package
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
` (2 preceding siblings ...)
2017-10-19 0:22 ` [Buildroot] [PATCH 04/12] docker-engine: select static for tini and dumb-init Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-19 0:22 ` [Buildroot] [PATCH 06/12] docker-engine: add dependency on docker-proxy Christian Stewart
` (8 subsequent siblings)
12 siblings, 0 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
Add docker-proxy package to Buildroot. Needed by docker-engine at
runtime, and previously not included. This leads to the following error
when attempting to port-map ports to a container:
$ docker run -p 8080:8080 nginx
docker: Error response from daemon: driver failed programming external
connectivity on endpoint:
exec: "docker-proxy": executable file not found in $PATH.
Docker expects the docker-proxy binary to exist in the PATH.
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/Config.in | 1 +
package/docker-proxy/Config.in | 18 +++++++++++++
package/docker-proxy/docker-proxy.hash | 2 ++
package/docker-proxy/docker-proxy.mk | 46 ++++++++++++++++++++++++++++++++++
4 files changed, 67 insertions(+)
create mode 100644 package/docker-proxy/Config.in
create mode 100644 package/docker-proxy/docker-proxy.hash
create mode 100644 package/docker-proxy/docker-proxy.mk
diff --git a/package/Config.in b/package/Config.in
index f8f9f39167..909a8c5d1a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1903,6 +1903,7 @@ menu "System tools"
source "package/debianutils/Config.in"
source "package/docker-containerd/Config.in"
source "package/docker-engine/Config.in"
+ source "package/docker-proxy/Config.in"
source "package/dsp-tools/Config.in"
source "package/efibootmgr/Config.in"
source "package/efivar/Config.in"
diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in
new file mode 100644
index 0000000000..4f414b24b1
--- /dev/null
+++ b/package/docker-proxy/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_DOCKER_PROXY
+ bool "docker-proxy"
+ depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ help
+ Libnetwork is a Container Network Model that provides a
+ consistent programming interface and the required network
+ abstractions for applications.
+
+ This package provides docker-proxy, a run-time dependency of Docker.
+
+ https://github.com/docker/libnetwork
+
+comment "docker-proxy needs a toolchain w/ threads"
+ depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash
new file mode 100644
index 0000000000..3ec184f54f
--- /dev/null
+++ b/package/docker-proxy/docker-proxy.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz
diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk
new file mode 100644
index 0000000000..3bf6546d26
--- /dev/null
+++ b/package/docker-proxy/docker-proxy.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
+# docker-proxy
+#
+################################################################################
+
+DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e
+DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION))
+
+DOCKER_PROXY_LICENSE = Apache-2.0
+DOCKER_PROXY_LICENSE_FILES = LICENSE
+
+DOCKER_PROXY_DEPENDENCIES = host-go host-pkgconf
+
+DOCKER_PROXY_GOPATH = "$(@D)/gopath"
+DOCKER_PROXY_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
+ CGO_ENABLED=1 \
+ CGO_NO_EMULATION=1 \
+ GOBIN="$(@D)/bin" \
+ GOPATH="$(DOCKER_PROXY_GOPATH)" \
+ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+ $(TARGET_MAKE_ENV)
+
+ifeq ($(BR2_STATIC_LIBS),y)
+DOCKER_PROXY_GLDFLAGS += -extldflags '-static'
+endif
+
+define DOCKER_PROXY_CONFIGURE_CMDS
+ mkdir -p $(DOCKER_PROXY_GOPATH)/src/github.com/docker
+ ln -fs $(@D) $(DOCKER_PROXY_GOPATH)/src/github.com/docker/libnetwork
+endef
+
+define DOCKER_PROXY_BUILD_CMDS
+ cd $(@D)/gopath/src/github.com/docker/libnetwork; \
+ $(DOCKER_PROXY_MAKE_ENV) \
+ $(HOST_DIR)/usr/bin/go build -v \
+ -o $(@D)/bin/docker-proxy \
+ -ldflags "$(DOCKER_PROXY_GLDFLAGS)" \
+ github.com/docker/libnetwork/cmd/proxy
+endef
+
+define DOCKER_PROXY_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/bin/docker-proxy $(TARGET_DIR)/usr/bin/docker-proxy
+endef
+
+$(eval $(generic-package))
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 06/12] docker-engine: add dependency on docker-proxy
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
` (3 preceding siblings ...)
2017-10-19 0:22 ` [Buildroot] [PATCH 05/12] docker-proxy: new package Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-19 0:22 ` [Buildroot] [PATCH 07/12] go: bump version to 1.9 Christian Stewart
` (7 subsequent siblings)
12 siblings, 0 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
docker-proxy is needed by docker-engine at runtime, and was
previously not included. This leads to the following error
when attempting to port-map ports to a container:
$ docker run -p 8080:8080 nginx
docker: Error response from daemon: driver failed programming external
connectivity on endpoint:
exec: "docker-proxy": executable file not found in $PATH.
Docker expects the docker-proxy binary to exist in the PATH.
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/docker-engine/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 47ac7f57a3..05e7aca7ab 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -16,6 +16,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DAEMON
default y
depends on BR2_USE_MMU # docker-containerd
select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
+ select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
select BR2_PACKAGE_IPTABLES # runtime dependency
select BR2_PACKAGE_SQLITE # runtime dependency
help
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 07/12] go: bump version to 1.9
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
` (4 preceding siblings ...)
2017-10-19 0:22 ` [Buildroot] [PATCH 06/12] docker-engine: add dependency on docker-proxy Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-19 3:50 ` Baruch Siach
` (2 more replies)
2017-10-19 0:22 ` [Buildroot] [PATCH 08/12] runc: bump to v1.0.0-rc4 Christian Stewart
` (6 subsequent siblings)
12 siblings, 3 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
Bumping Go to 1.9 from 1.7.
Go 1.8 comes with significant performance improvements, particularly
around ARM: "CPU time required by our benchmark programs was reduced by
20-30% on 32-bit ARM systems."
Go 1.9 is required for docker-engine and other Go packages in Buildroot.
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/go/go.hash | 4 ++--
package/go/go.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/go/go.hash b/package/go/go.hash
index 1836af2482..445a0b7c20 100644
--- a/package/go/go.hash
+++ b/package/go/go.hash
@@ -1,2 +1,2 @@
-# Locally computed:
-sha256 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 go1.8.3.src.tar.gz
+# From https://golang.org/dl/
+sha256 a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993 go1.9.src.tar.gz
diff --git a/package/go/go.mk b/package/go/go.mk
index 0781dff035..93e1189c23 100644
--- a/package/go/go.mk
+++ b/package/go/go.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GO_VERSION = 1.8.3
+GO_VERSION = 1.9
GO_SITE = https://storage.googleapis.com/golang
GO_SOURCE = go$(GO_VERSION).src.tar.gz
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 07/12] go: bump version to 1.9
2017-10-19 0:22 ` [Buildroot] [PATCH 07/12] go: bump version to 1.9 Christian Stewart
@ 2017-10-19 3:50 ` Baruch Siach
2017-10-19 8:19 ` Thomas Petazzoni
2017-10-22 10:18 ` Thomas Petazzoni
2 siblings, 0 replies; 29+ messages in thread
From: Baruch Siach @ 2017-10-19 3:50 UTC (permalink / raw)
To: buildroot
Hi Christian,
On Wed, Oct 18, 2017 at 08:22:52PM -0400, Christian Stewart wrote:
> Bumping Go to 1.9 from 1.7.
This patch bumps from 1.8.3. Mention of the old version is not necessary, but
it should be correct.
baruch
> Go 1.8 comes with significant performance improvements, particularly
> around ARM: "CPU time required by our benchmark programs was reduced by
> 20-30% on 32-bit ARM systems."
>
> Go 1.9 is required for docker-engine and other Go packages in Buildroot.
>
> Signed-off-by: Christian Stewart <christian@paral.in>
> ---
> package/go/go.hash | 4 ++--
> package/go/go.mk | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/package/go/go.hash b/package/go/go.hash
> index 1836af2482..445a0b7c20 100644
> --- a/package/go/go.hash
> +++ b/package/go/go.hash
> @@ -1,2 +1,2 @@
> -# Locally computed:
> -sha256 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 go1.8.3.src.tar.gz
> +# From https://golang.org/dl/
> +sha256 a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993 go1.9.src.tar.gz
> diff --git a/package/go/go.mk b/package/go/go.mk
> index 0781dff035..93e1189c23 100644
> --- a/package/go/go.mk
> +++ b/package/go/go.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -GO_VERSION = 1.8.3
> +GO_VERSION = 1.9
> GO_SITE = https://storage.googleapis.com/golang
> GO_SOURCE = go$(GO_VERSION).src.tar.gz
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 07/12] go: bump version to 1.9
2017-10-19 0:22 ` [Buildroot] [PATCH 07/12] go: bump version to 1.9 Christian Stewart
2017-10-19 3:50 ` Baruch Siach
@ 2017-10-19 8:19 ` Thomas Petazzoni
2017-10-19 16:15 ` Christian Stewart
2017-10-22 10:18 ` Thomas Petazzoni
2 siblings, 1 reply; 29+ messages in thread
From: Thomas Petazzoni @ 2017-10-19 8:19 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 18 Oct 2017 20:22:52 -0400, Christian Stewart wrote:
> Bumping Go to 1.9 from 1.7.
>
> Go 1.8 comes with significant performance improvements, particularly
> around ARM: "CPU time required by our benchmark programs was reduced by
> 20-30% on 32-bit ARM systems."
>
> Go 1.9 is required for docker-engine and other Go packages in Buildroot.
>
> Signed-off-by: Christian Stewart <christian@paral.in>
Since you're bumping go, it would be nice if you could review/test:
https://patchwork.ozlabs.org/patch/826431/
https://patchwork.ozlabs.org/patch/826433/
https://patchwork.ozlabs.org/patch/826432/
https://patchwork.ozlabs.org/patch/826434/
And specifically the first one.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 07/12] go: bump version to 1.9
2017-10-19 0:22 ` [Buildroot] [PATCH 07/12] go: bump version to 1.9 Christian Stewart
2017-10-19 3:50 ` Baruch Siach
2017-10-19 8:19 ` Thomas Petazzoni
@ 2017-10-22 10:18 ` Thomas Petazzoni
2 siblings, 0 replies; 29+ messages in thread
From: Thomas Petazzoni @ 2017-10-22 10:18 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 18 Oct 2017 20:22:52 -0400, Christian Stewart wrote:
> Bumping Go to 1.9 from 1.7.
>
> Go 1.8 comes with significant performance improvements, particularly
> around ARM: "CPU time required by our benchmark programs was reduced by
> 20-30% on 32-bit ARM systems."
>
> Go 1.9 is required for docker-engine and other Go packages in Buildroot.
>
> Signed-off-by: Christian Stewart <christian@paral.in>
> ---
> package/go/go.hash | 4 ++--
> package/go/go.mk | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 08/12] runc: bump to v1.0.0-rc4
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
` (5 preceding siblings ...)
2017-10-19 0:22 ` [Buildroot] [PATCH 07/12] go: bump version to 1.9 Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-22 10:23 ` Thomas Petazzoni
2017-10-19 0:22 ` [Buildroot] [PATCH 09/12] docker-containerd: bump to 3addd84 Christian Stewart
` (5 subsequent siblings)
12 siblings, 1 reply; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
This is a dependency of docker-engine v2017.07.0-ce.
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/runc/runc.hash | 2 +-
package/runc/runc.mk | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/package/runc/runc.hash b/package/runc/runc.hash
index 3e188c5c79..08e306d0dc 100644
--- a/package/runc/runc.hash
+++ b/package/runc/runc.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 b5c50d7d9a5f610d5424f96196efa306ec708fd9299302dd919545099c16b7c1 runc-9c2d8d184e5da67c95d601382adf14862e4f2228.tar.gz
+sha256 3ffefd293932d2ad509701878dd7dd6ef498c3667198a33e8e5d5a3cbce0eeaa runc-v1.0.0-rc4.tar.gz
diff --git a/package/runc/runc.mk b/package/runc/runc.mk
index fb3fec20f5..0b51e11896 100644
--- a/package/runc/runc.mk
+++ b/package/runc/runc.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RUNC_VERSION = 9c2d8d184e5da67c95d601382adf14862e4f2228
+RUNC_VERSION = v1.0.0-rc4
RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION))
RUNC_LICENSE = Apache-2.0
RUNC_LICENSE_FILES = LICENSE
@@ -38,7 +38,8 @@ define RUNC_CONFIGURE_CMDS
endef
define RUNC_BUILD_CMDS
- cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \
+ cd $(RUNC_GOPATH)/src/github.com/opencontainers/runc && \
+ $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \
build -v -o $(@D)/bin/runc \
-tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" .
endef
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 08/12] runc: bump to v1.0.0-rc4
2017-10-19 0:22 ` [Buildroot] [PATCH 08/12] runc: bump to v1.0.0-rc4 Christian Stewart
@ 2017-10-22 10:23 ` Thomas Petazzoni
0 siblings, 0 replies; 29+ messages in thread
From: Thomas Petazzoni @ 2017-10-22 10:23 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 18 Oct 2017 20:22:53 -0400, Christian Stewart wrote:
> This is a dependency of docker-engine v2017.07.0-ce.
>
> Signed-off-by: Christian Stewart <christian@paral.in>
> ---
> package/runc/runc.hash | 2 +-
> package/runc/runc.mk | 5 +++--
> 2 files changed, 4 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 09/12] docker-containerd: bump to 3addd84
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
` (6 preceding siblings ...)
2017-10-19 0:22 ` [Buildroot] [PATCH 08/12] runc: bump to v1.0.0-rc4 Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-19 0:22 ` [Buildroot] [PATCH 10/12] docker-proxy: bump to 9647f99 Christian Stewart
` (4 subsequent siblings)
12 siblings, 0 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
This commit bumps docker-containerd to:
3addd840653146c90a254301d6c3a663c7fd6429
This is a dependency of docker-engine v2017.07.0-ce.
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/docker-containerd/docker-containerd.hash | 2 +-
package/docker-containerd/docker-containerd.mk | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
index 992eb5b01a..cdc3a0b4fb 100644
--- a/package/docker-containerd/docker-containerd.hash
+++ b/package/docker-containerd/docker-containerd.hash
@@ -1,2 +1,2 @@
# Computed locally
-sha256 da89086a7c643702a2ddecec67a45d3d8e4b0d610dd19036be63e6bd54cc1a85 docker-containerd-9048e5e50717ea4497b757314bad98ea3763c145.tar.gz
+sha256 3549e9c4ff1f71c6c9c5932b36b209f9b7ecae3662d251a88ce349853f0249fc docker-containerd-3addd840653146c90a254301d6c3a663c7fd6429.tar.gz
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index ffbadb0c3f..fe30f19817 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -4,8 +4,8 @@
#
################################################################################
-DOCKER_CONTAINERD_VERSION = 9048e5e50717ea4497b757314bad98ea3763c145
-DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION))
+DOCKER_CONTAINERD_VERSION = 3addd840653146c90a254301d6c3a663c7fd6429
+DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code
@@ -18,22 +18,23 @@ DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
GOPATH="$(DOCKER_CONTAINERD_GOPATH)"
DOCKER_CONTAINERD_GLDFLAGS = \
- -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
+ -X github.com/containerd/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
ifeq ($(BR2_STATIC_LIBS),y)
DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static'
endif
define DOCKER_CONTAINERD_CONFIGURE_CMDS
- mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker
- ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker/containerd
+ mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd
+ ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd/containerd
mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers
ln -s $(RUNC_SRCDIR) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers/runc
endef
define DOCKER_CONTAINERD_BUILD_CMDS
$(foreach d,ctr containerd containerd-shim,\
- cd $(@D); $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/bin/go build \
+ cd $(DOCKER_CONTAINERD_GOPATH)/src/github.com/containerd/containerd; \
+ $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/usr/go build \
-v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" ./$(d)$(sep))
endef
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 10/12] docker-proxy: bump to 9647f99
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
` (7 preceding siblings ...)
2017-10-19 0:22 ` [Buildroot] [PATCH 09/12] docker-containerd: bump to 3addd84 Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-19 0:22 ` [Buildroot] [PATCH 11/12] docker-engine: bump to v17.07.0-ce Christian Stewart
` (3 subsequent siblings)
12 siblings, 0 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
This commit bumps docker-proxy to:
9647f993a81e404639592e8ed73693b48ec09c2e
This is a dependency of docker v2017.07:
docker/docker-ce#c867dee see components/engine/vendor.conf.
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 3ec184f54f..4e6ba72133 100644
--- a/package/docker-proxy/docker-proxy.hash
+++ b/package/docker-proxy/docker-proxy.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz
+sha256 dc0aa06e490fcdb799414f339570f85b474500aecb82aeeb3b7c8215d558dbff docker-proxy-9647f993a81e404639592e8ed73693b48ec09c2e.tar.gz
diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk
index 3bf6546d26..330ecd527f 100644
--- a/package/docker-proxy/docker-proxy.mk
+++ b/package/docker-proxy/docker-proxy.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e
+DOCKER_PROXY_VERSION = 9647f993a81e404639592e8ed73693b48ec09c2e
DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION))
DOCKER_PROXY_LICENSE = Apache-2.0
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 11/12] docker-engine: bump to v17.07.0-ce
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
` (8 preceding siblings ...)
2017-10-19 0:22 ` [Buildroot] [PATCH 10/12] docker-proxy: bump to 9647f99 Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-19 0:22 ` [Buildroot] [PATCH 12/12] docker-engine: don't link against libsystemd without systemd Christian Stewart
` (2 subsequent siblings)
12 siblings, 0 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
This commit bumps docker-engine to v17.07.0-ce.
The docker-engine repository has now been moved to:
https://github.com/docker/docker-ce
The CLI and the daemon have been split into separate repositories:
- https://github.com/docker/cli
- https://github.com/moby/moby
The daemon is still in the "moby" repo, but the import paths in Go are:
github.com/docker/docker
As before. Presumably, the maintainers will eventually split the engine out
to a different repository as well.
Please note that they literally copy the entire docker/cli and moby/moby
repositories into the docker-ce repository, as well as all of their
dependencies in the vendor directories. This means that downloading the
docker-ce source tarball contains:
- The cli sources
- The daemon sources
- Two copies of all of the dependencies of both
At the moment this is unavoidable, but does produce a working build.
The patch was removed, as it is included in this release.
Signed-off-by: Christian Stewart <christian@paral.in>
---
package/docker-engine/docker-engine.hash | 2 +-
package/docker-engine/docker-engine.mk | 54 ++++++++++++++++++--------------
2 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash
index 6c0ed338a5..0d017dc998 100644
--- a/package/docker-engine/docker-engine.hash
+++ b/package/docker-engine/docker-engine.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121 docker-engine-v17.05.0-ce.tar.gz
+sha256 e3193118306e0d4dc4b9ad329870633d3a78d80c5f00ca6185e14185e717ca7e docker-engine-v17.07.0-ce.tar.gz
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index a2776ed78c..0542d73b36 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -4,9 +4,9 @@
#
################################################################################
-DOCKER_ENGINE_VERSION = v17.05.0-ce
-DOCKER_ENGINE_COMMIT = 89658bed64c2a8fe05a978e5b87dbec409d57a0f
-DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))
+DOCKER_ENGINE_VERSION = v17.07.0-ce
+DOCKER_ENGINE_COMMIT = 87847530f7176a48348d196f7c23bbd058052af1
+DOCKER_ENGINE_SITE = $(call github,docker,docker-ce,$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_LICENSE = Apache-2.0
DOCKER_ENGINE_LICENSE_FILES = LICENSE
@@ -19,23 +19,25 @@ DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
CGO_NO_EMULATION=1 \
GOBIN="$(@D)/bin" \
GOPATH="$(DOCKER_ENGINE_GOPATH)" \
- PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+ PKG_CONFIG="$(PKG_CONFIG)" \
$(TARGET_MAKE_ENV)
DOCKER_ENGINE_GLDFLAGS = \
-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \
- -X main.Version=$(DOCKER_ENGINE_VERSION)
+ -X main.Version=$(DOCKER_ENGINE_VERSION) \
+ -X github.com/docker/cli/cli.GitCommit=$(DOCKER_ENGINE_VERSION) \
+ -X github.com/docker/cli/cli.Version=$(DOCKER_ENGINE_VERSION)
+
+DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen
+DOCKER_ENGINE_BUILD_TARGETS = cli:docker
+DOCKER_ENGINE_BUILD_TARGET_PARSE = \
+ export targetpkg=$$(echo $(target) | cut -d: -f1); \
+ export targetbin=$$(echo $(target) | cut -d: -f2)
ifeq ($(BR2_STATIC_LIBS),y)
DOCKER_ENGINE_GLDFLAGS += -extldflags '-static'
-else
-ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT),y)
-DOCKER_ENGINE_GLDFLAGS_DOCKER += -extldflags '-static'
+DOCKER_ENGINE_BUILD_TAGS += static_build
endif
-endif
-
-DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen
-DOCKER_ENGINE_BUILD_TARGETS = docker
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
DOCKER_ENGINE_BUILD_TAGS += seccomp
@@ -43,13 +45,13 @@ DOCKER_ENGINE_DEPENDENCIES += libseccomp
endif
ifeq ($(BR2_INIT_SYSTEMD),y)
-DOCKER_ENGINE_BUILD_TAGS += journald
DOCKER_ENGINE_DEPENDENCIES += systemd
+DOCKER_ENGINE_BUILD_TAGS += systemd journald
endif
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
DOCKER_ENGINE_BUILD_TAGS += daemon
-DOCKER_ENGINE_BUILD_TARGETS += dockerd
+DOCKER_ENGINE_BUILD_TARGETS += docker:dockerd
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT),y)
DOCKER_ENGINE_INIT = dumb-init
@@ -83,10 +85,12 @@ endif
define DOCKER_ENGINE_CONFIGURE_CMDS
mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker
- ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker
- cd $(@D) && \
+ ln -fs $(@D)/components/engine $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker
+ ln -fs $(@D)/components/cli $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/cli
+ cd $(@D)/components/engine && \
GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \
BUILDTIME="$$(date)" \
+ IAMSTATIC="true" \
VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \
bash ./hack/make/.go-autogen
@@ -95,9 +99,9 @@ endef
ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD
- $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \
+ $(INSTALL) -D -m 0644 $(@D)/components/engine/contrib/init/systemd/docker.service \
$(TARGET_DIR)/usr/lib/systemd/system/docker.service
- $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \
+ $(INSTALL) -D -m 0644 $(@D)/components/engine/contrib/init/systemd/docker.socket \
$(TARGET_DIR)/usr/lib/systemd/system/docker.socket
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/
ln -fs ../../../../usr/lib/systemd/system/docker.service \
@@ -112,19 +116,21 @@ endif
define DOCKER_ENGINE_BUILD_CMDS
$(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \
- cd $(@D)/gopath/src/github.com/docker/docker; \
+ $(DOCKER_ENGINE_BUILD_TARGET_PARSE); \
+ cd $(@D)/gopath/src/github.com/docker/$${targetpkg}; \
$(DOCKER_ENGINE_MAKE_ENV) \
- $(HOST_DIR)/bin/go build -v \
- -o $(@D)/bin/$(target) \
+ $(HOST_DIR)/usr/go build -v \
+ -o $(@D)/bin/$${targetbin} \
-tags "$(DOCKER_ENGINE_BUILD_TAGS)" \
- -ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \
- github.com/docker/docker/cmd/$(target)
+ -ldflags "$(DOCKER_ENGINE_GLDFLAGS)" \
+ ./cmd/$${targetbin}
)
endef
define DOCKER_ENGINE_INSTALL_TARGET_CMDS
$(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \
- $(INSTALL) -D -m 0755 $(@D)/bin/$(target) $(TARGET_DIR)/usr/bin/$(target)
+ $(DOCKER_ENGINE_BUILD_TARGET_PARSE); \
+ $(INSTALL) -D -m 0755 $(@D)/bin/$${targetbin} $(TARGET_DIR)/usr/bin/$${targetbin}
)
$(if $(filter $(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y), \
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 12/12] docker-engine: don't link against libsystemd without systemd
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
` (9 preceding siblings ...)
2017-10-19 0:22 ` [Buildroot] [PATCH 11/12] docker-engine: bump to v17.07.0-ce Christian Stewart
@ 2017-10-19 0:22 ` Christian Stewart
2017-10-19 14:04 ` [Buildroot] [PATCH 01/12] dumb-init: new package Arnout Vandecappelle
2017-10-21 13:50 ` Arnout Vandecappelle
12 siblings, 0 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 0:22 UTC (permalink / raw)
To: buildroot
Docker links against libsystemd unconditionally in the latest release. This is
entirely unnecessary, and the included patch disables this behavior in the
absence of the systemd build tag, which is now set when systemd is enabled in
buildroot.
This fixes linking errors when building against sysv, and avoids adding a
hard dependency on systemd in Docker.
Docker-Engine should also use the target pkgconfig, not the host pkgconfig. This
is fixed in this patch.
Signed-off-by: Christian Stewart <christian@paral.in>
---
...king-against-libsystemd-with-absence-of-s.patch | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 package/docker-engine/0001-disable-linking-against-libsystemd-with-absence-of-s.patch
diff --git a/package/docker-engine/0001-disable-linking-against-libsystemd-with-absence-of-s.patch b/package/docker-engine/0001-disable-linking-against-libsystemd-with-absence-of-s.patch
new file mode 100644
index 0000000000..9a8b126d5f
--- /dev/null
+++ b/package/docker-engine/0001-disable-linking-against-libsystemd-with-absence-of-s.patch
@@ -0,0 +1,54 @@
+From 56ab23f03df71d6cd084a9f4fd9c382e47b0e26e Mon Sep 17 00:00:00 2001
+From: Christian Stewart <christian@paral.in>
+Date: Wed, 20 Sep 2017 18:09:26 +0100
+Subject: [PATCH] disable linking against libsystemd with absence of systemd
+ build tag
+
+For some reason, as of this release, Docker now MUST link against libsystemd.
+
+This is not for a good reason. It's because of two lines in the daemon startup,
+which notify the systemd daemon that the daemon is done starting.
+
+Requiring the presence of an entire systemd library to build Docker is not
+suitable for Buildroot. This patch adds a build tag called "systemd," which
+when not set, will disable linking against libsystemd.
+
+Signed-off-by: Christian Stewart <christian@paral.in>
+---
+ components/engine/cmd/dockerd/daemon_linux.go | 2 +-
+ components/engine/cmd/dockerd/daemon_linux_nosystemd.go | 13 +++++++++++++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+ create mode 100644 components/engine/cmd/dockerd/daemon_linux_nosystemd.go
+
+diff --git a/components/engine/cmd/dockerd/daemon_linux.go b/components/engine/cmd/dockerd/daemon_linux.go
+index a909ee4fbd..89c16bac2f 100644
+--- a/components/engine/cmd/dockerd/daemon_linux.go
++++ b/components/engine/cmd/dockerd/daemon_linux.go
+@@ -1,4 +1,4 @@
+-// +build linux
++// +build linux,systemd
+
+ package main
+
+diff --git a/components/engine/cmd/dockerd/daemon_linux_nosystemd.go b/components/engine/cmd/dockerd/daemon_linux_nosystemd.go
+new file mode 100644
+index 0000000000..4f7e92af0f
+--- /dev/null
++++ b/components/engine/cmd/dockerd/daemon_linux_nosystemd.go
+@@ -0,0 +1,13 @@
++// +build linux,!systemd
++
++package main
++
++// preNotifySystem sends a message to the host when the API is active, but before the daemon is
++func preNotifySystem() {
++ // noop without systemd
++}
++
++// notifySystem sends a message to the host when the server is ready to be used
++func notifySystem() {
++ // noop without systemd
++}
+--
+2.13.5
+
--
2.13.6
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 01/12] dumb-init: new package
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
` (10 preceding siblings ...)
2017-10-19 0:22 ` [Buildroot] [PATCH 12/12] docker-engine: don't link against libsystemd without systemd Christian Stewart
@ 2017-10-19 14:04 ` Arnout Vandecappelle
2017-10-19 16:10 ` Christian Stewart
2017-10-21 13:50 ` Arnout Vandecappelle
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2017-10-19 14:04 UTC (permalink / raw)
To: buildroot
Hi Christian,
This is already v3 of the series. Could you explain the changes w.r.t. to the
previous versions? You should do that in the commit message...
On 19-10-17 02:22, Christian Stewart wrote:
> dumb-init is a minimal init process to act as PID 1 for containers.
>
> dumb-init can be used to satisfy docker-engine's docker-init binary
> requirement.
>
> In many cases docker-init backing processes like dumb-init must be static, as
> they are executed inside a container in an unknown environment. This
> patch includes an option to specifically compile dumb-init statically, even if
> the system is compiled dynamically.
>
> Signed-off-by: Christian Stewart <christian@paral.in>
... here, separated with a --- line:
---
v3:
- Use foo instead of bar
- Update commit message to explain baz better [Thomas]
The [Thomas] means that this change was based on review feedback from Thomas.
For entirely new patches, you just write:
v3: New patch
Also, you should send the series with "v3" in the subject. With modern git, you
can do that with the -v3 parameter to git send-email or git format-patch.
Of course, no need to resend the series for this, but please do explain in a
mail what the changes are. Makes reviewing a lot simpler.
Regards,
Arnout
[snip]
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 01/12] dumb-init: new package
2017-10-19 14:04 ` [Buildroot] [PATCH 01/12] dumb-init: new package Arnout Vandecappelle
@ 2017-10-19 16:10 ` Christian Stewart
0 siblings, 0 replies; 29+ messages in thread
From: Christian Stewart @ 2017-10-19 16:10 UTC (permalink / raw)
To: buildroot
Hi Arnout,
On Thu, Oct 19, 2017 at 10:04 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
> This is already v3 of the series. Could you explain the changes w.r.t. to the
> previous versions? You should do that in the commit message...
Yes, typically I would follow the usual workflow but as this patch
series has for some reason taken many months to merge I neglected it
this time. This series is more of a, "oh hey, that's still pending, I
should go submit it" rather than another distinct revision. I'll be
sure to follow the guidelines in the future.
The changes here incorporated the minor requested changes from the last series:
- standardize to the github notation for SITE
- update to the latest version of tini
Overall very minor which is why I waited a bit to re-spin, there don't
seem to be many requested changes to this series and I've tested it
for a few months now.
Best,
Christian
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 01/12] dumb-init: new package
2017-10-19 0:22 [Buildroot] [PATCH 01/12] dumb-init: new package Christian Stewart
` (11 preceding siblings ...)
2017-10-19 14:04 ` [Buildroot] [PATCH 01/12] dumb-init: new package Arnout Vandecappelle
@ 2017-10-21 13:50 ` Arnout Vandecappelle
2017-10-24 3:07 ` Christian Stewart
12 siblings, 1 reply; 29+ messages in thread
From: Arnout Vandecappelle @ 2017-10-21 13:50 UTC (permalink / raw)
To: buildroot
Hi Christian,
We were about to apply but then we thought:
On 19-10-17 02:22, Christian Stewart wrote:
> +config BR2_PACKAGE_DUMB_INIT_STATIC
> + bool "build static"
> + help
> + Enables static compilation for dumb-init.
Is it really useful to have this as an option? In practice you'll always want
to link statically, no?
If you're OK with this I can remove the option while applying, no need to
respin just for this.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 29+ messages in thread