docker-engine: fix journald logging driver
authorChristian Stewart <christian@paral.in>
Tue, 30 May 2017 03:50:04 +0000 (20:50 -0700)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 30 May 2017 07:13:49 +0000 (09:13 +0200)
The Docker engine can optionally log to systemd-journald. For this
driver to work correctly, Docker needs to build against
systemd-journald's client library.

This patch conditionally adds a build-time dependency on systemd and
enables compiling the journald driver in docker-engine if systemd is
used as the Buildroot init process.

Signed-off-by: Christian Stewart <christian@paral.in>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/docker-engine/docker-engine.mk

index c4c1157f437c26e3af06864bc502ee6267c1b23e..0176f51bb02531ed6a1f44509bc2d82e1556c1c8 100644 (file)
@@ -42,6 +42,11 @@ DOCKER_ENGINE_BUILD_TAGS += seccomp
 DOCKER_ENGINE_DEPENDENCIES += libseccomp
 endif
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+DOCKER_ENGINE_BUILD_TAGS += journald
+DOCKER_ENGINE_DEPENDENCIES += systemd
+endif
+
 ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
 DOCKER_ENGINE_BUILD_TAGS += daemon
 DOCKER_ENGINE_BUILD_TARGETS += dockerd