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 #28298 from vdemeester/compose-swarm-tty

Browse source 
Add support for tty in compose to swarm
This commit is contained in:
Brian Goff 2016-11-11 09:06:10 -05:00 • committed by GitHub
commit 0bb6bac793
5 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -504,6 +504,7 @@ func convertService(
User: service.User, User: service.User,
Mounts: mounts, Mounts: mounts,
StopGracePeriod: service.StopGracePeriod, StopGracePeriod: service.StopGracePeriod,
TTY: service.Tty,
}, },
Resources: resources, Resources: resources,
RestartPolicy: restartPolicy, RestartPolicy: restartPolicy,

2
vendor.conf
View file

@ -132,7 +132,7 @@ github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
github.com/docker/go-metrics 86138d05f285fd9737a99bee2d9be30866b59d72 github.com/docker/go-metrics 86138d05f285fd9737a99bee2d9be30866b59d72
# composefile # composefile
github.com/aanand/compose-file 480a79677acccb83b52c41161c22eaf4358460cc github.com/aanand/compose-file 8cff34df885ef07824138236bc4d27d359888b17
github.com/mitchellh/mapstructure f3009df150dadf309fdee4a54ed65c124afad715 github.com/mitchellh/mapstructure f3009df150dadf309fdee4a54ed65c124afad715
github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a
github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45 github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45

4
vendor/github.com/aanand/compose-file/loader/loader.go generated vendored
View file

@ -68,8 +68,8 @@ func Load(configDetails types.ConfigDetails) (*types.Config, error) {
cfg := types.Config{} cfg := types.Config{}
version := configDict["version"].(string) version := configDict["version"].(string)
if version != "3" { if version != "3" && version != "3.0" {
return nil, fmt.Errorf("Unsupported version: %#v. The only supported version is 3", version) return nil, fmt.Errorf(`Unsupported Compose file version: %#v. The only version supported is "3" (or "3.0")`, version)
} }
if services, ok := configDict["services"]; ok { if services, ok := configDict["services"]; ok {

10
vendor/github.com/aanand/compose-file/schema/bindata.go generated vendored
View file

File diff suppressed because one or more lines are too long

10
vendor/github.com/aanand/compose-file/types/types.go generated vendored
View file

@ -14,7 +14,6 @@ var UnsupportedProperties = []string{
"dns_search", "dns_search",
"domainname", "domainname",
"external_links", "external_links",
"extra_hosts",
"ipc", "ipc",
"links", "links",
"mac_address", "mac_address",
@ -24,7 +23,6 @@ var UnsupportedProperties = []string{
"restart", "restart",
"security_opt", "security_opt",
"shm_size", "shm_size",
"stdin_open",
"stop_signal", "stop_signal",
"tmpfs", "tmpfs",
} }
@ -84,6 +82,7 @@ type ServiceConfig struct {
ExternalLinks []string `mapstructure:"external_links"` ExternalLinks []string `mapstructure:"external_links"`
ExtraHosts map[string]string `mapstructure:"extra_hosts" compose:"list_or_dict_colon"` ExtraHosts map[string]string `mapstructure:"extra_hosts" compose:"list_or_dict_colon"`
Hostname string Hostname string
HealthCheck *HealthCheckConfig
Image string Image string
Ipc string Ipc string
Labels map[string]string `compose:"list_or_dict_equals"` Labels map[string]string `compose:"list_or_dict_equals"`
@ -124,6 +123,13 @@ type DeployConfig struct {
Placement Placement Placement Placement
} }
type HealthCheckConfig struct {
Command []string `compose:"shell_command"`
Timeout string
Interval string
Retries *uint64
}
type UpdateConfig struct { type UpdateConfig struct {
Parallelism uint64 Parallelism uint64
Delay time.Duration Delay time.Duration