kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #29123 from vdemeester/29116-compose-to-swarm-logging

Browse source 
Handle logging in compose to swarm
This commit is contained in:
Brian Goff 2016-12-05 20:39:08 -05:00 committed by GitHub
commit 1f09d68a6e
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/types/swarm/common.go
View file

@ -19,3 +19,9 @@ type Annotations struct {
Name string `json:",omitempty"` Name string `json:",omitempty"`
Labels map[string]string `json:",omitempty"` Labels map[string]string `json:",omitempty"`
} }
// Driver represents a driver (network, logging).
type Driver struct {
Name string `json:",omitempty"`
Options map[string]string `json:",omitempty"`
}

6
api/types/swarm/network.go
View file

@ -109,9 +109,3 @@ type IPAMConfig struct {
Range string `json:",omitempty"` Range string `json:",omitempty"`
Gateway string `json:",omitempty"` Gateway string `json:",omitempty"`
} }
// Driver represents a network driver.
type Driver struct {
Name string `json:",omitempty"`
Options map[string]string `json:",omitempty"`
}

9
cli/command/stack/deploy.go
View file

@ -567,6 +567,14 @@ func convertService(
return swarm.ServiceSpec{}, err 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{ serviceSpec := swarm.ServiceSpec{
Annotations: swarm.Annotations{ Annotations: swarm.Annotations{
Name: name, Name: name,
@ -589,6 +597,7 @@ func convertService(
TTY: service.Tty, TTY: service.Tty,
OpenStdin: service.StdinOpen, OpenStdin: service.StdinOpen,
}, },
LogDriver: logDriver,
Resources: resources, Resources: resources,
RestartPolicy: restartPolicy, RestartPolicy: restartPolicy,
Placement: &swarm.Placement{ Placement: &swarm.Placement{