Skip to contentSkip to conversation

docker-engine: fix journald logging driver

PATCH New Christian Stewart 2 participants 2 messages May 30, 2017

lore
Share & tools
lore

Christian Stewart

author
#0 lore raw

PATCH 1/1 docker-engine: fix journald logging driver

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 <[email protected]>
---
 package/docker-engine/docker-engine.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/docker-engine/docker-engine.mk +5 -0
index c4c1157..0176f51 100644
@@ -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
Signature · 1 line
2.10.2
#1 lore raw

PATCH 1/1 docker-engine: fix journald logging driver

Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christian" == Christian Stewart <[email protected]> writes:

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 <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard