summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stewart <christian@paral.in>2017-03-19 06:20:42 (GMT)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-19 20:23:40 (GMT)
commit8d060da5301ee8e9307af0ce55e4fa509eccc8fb (patch)
tree2060edc8c3b138a136afc68b240f7e9ad79b1a1a
parent8273895a5878372c0779dc40c2713ae966ebf2d6 (diff)
downloadbuildroot-8d060da5301ee8e9307af0ce55e4fa509eccc8fb.tar.gz
buildroot-8d060da5301ee8e9307af0ce55e4fa509eccc8fb.tar.bz2
package/docker-engine: introduce option to build CLI client statically
This is useful when bind-mounting the docker client binary into containers for a docker-in-docker setup. The Docker CLI communicates with the daemon over a socket. It is sometimes useful to bind-mount the Docker CLI and socket into containers at run-time, so that scripts within the containers can call the Docker API in the host using a client compatible with the host daemon. Signed-off-by: Christian Stewart <christian@paral.in> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/docker-engine/Config.in6
-rw-r--r--package/docker-engine/docker-engine.mk7
2 files changed, 12 insertions, 1 deletions
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 1879a56..7cf0d9e 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -25,6 +25,12 @@ config BR2_PACKAGE_DOCKER_ENGINE_DAEMON
config BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL
bool "build experimental features"
+config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT
+ bool "build static client"
+ depends on !BR2_STATIC_LIBS
+ help
+ Build a static docker client.
+
if BR2_PACKAGE_DOCKER_ENGINE_DAEMON
config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index 7f7840b..bf6f6a4 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -28,8 +28,13 @@ DOCKER_ENGINE_GLDFLAGS = \
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'
+endif
endif
+
DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen
DOCKER_ENGINE_BUILD_TARGETS = docker
@@ -100,7 +105,7 @@ define DOCKER_ENGINE_BUILD_CMDS
$(HOST_DIR)/usr/bin/go build -v \
-o $(@D)/bin/$(target) \
-tags "$(DOCKER_ENGINE_BUILD_TAGS)" \
- -ldflags "$(DOCKER_ENGINE_GLDFLAGS)" \
+ -ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \
github.com/docker/docker/cmd/$(target)
)
endef