1
0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00

Handle logging in compose to swarm

Logging configuration was completely ignore when deploy a compose file
to swarm. This fixes it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 68db0a20dd
Component: cli
This commit is contained in:
Vincent Demeester
2016-12-05 15:18:36 +01:00
parent 1a88f29901
commit 8986c729f3

View File

@@ -567,6 +567,14 @@ func convertService(
return swarm.ServiceSpec{}, err
}
var logDriver *swarm.Driver
if service.Logging != nil {
logDriver = &swarm.Driver{
Name: service.Logging.Driver,
Options: service.Logging.Options,
}
}
serviceSpec := swarm.ServiceSpec{
Annotations: swarm.Annotations{
Name: name,
@@ -589,6 +597,7 @@ func convertService(
TTY: service.Tty,
OpenStdin: service.StdinOpen,
},
LogDriver: logDriver,
Resources: resources,
RestartPolicy: restartPolicy,
Placement: &swarm.Placement{