luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Support StopTimeout for Docker tasksw 

Update github.com/fsouza/go-dockerclient
This commit is contained in:
Chelsea Holland Komlo 2017-11-29 14:33:01 -05:00
parent ec15b90d3a
commit 2208964948
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/driver/docker.go
View File

@ -1047,11 +1047,12 @@ func (d *DockerDriver) createContainerConfig(ctx *ExecContext, task *structs.Tas
}
config := &docker.Config{
Image: d.imageID,
Hostname: driverConfig.Hostname,
User: task.User,
Tty: driverConfig.TTY,
OpenStdin: driverConfig.Interactive,
Image: d.imageID,
Hostname: driverConfig.Hostname,
User: task.User,
Tty: driverConfig.TTY,
OpenStdin: driverConfig.Interactive,
StopTimeout: int(task.KillTimeout),
}
if driverConfig.WorkDir != "" {

1
vendor/github.com/fsouza/go-dockerclient/container.go generated vendored
View File

@ -300,6 +300,7 @@ type Config struct {
ExposedPorts map[Port]struct{} `json:"ExposedPorts,omitempty" yaml:"ExposedPorts,omitempty" toml:"ExposedPorts,omitempty"`
PublishService string `json:"PublishService,omitempty" yaml:"PublishService,omitempty" toml:"PublishService,omitempty"`
StopSignal string `json:"StopSignal,omitempty" yaml:"StopSignal,omitempty" toml:"StopSignal,omitempty"`
StopTimeout int `json:"StopTimeout,omitempty" yaml:"StopTimeout,omitempty" toml:"StopTimeout,omitempty"`
Env []string `json:"Env,omitempty" yaml:"Env,omitempty" toml:"Env,omitempty"`
Cmd []string `json:"Cmd" yaml:"Cmd" toml:"Cmd"`
Healthcheck *HealthConfig `json:"Healthcheck,omitempty" yaml:"Healthcheck,omitempty" toml:"Healthcheck,omitempty"`

2
vendor/github.com/fsouza/go-dockerclient/network.go generated vendored
View File

@ -112,7 +112,7 @@ func (c *Client) NetworkInfo(id string) (*Network, error) {
type CreateNetworkOptions struct {
Name string `json:"Name" yaml:"Name" toml:"Name"`
Driver string `json:"Driver" yaml:"Driver" toml:"Driver"`
IPAM IPAMOptions `json:"IPAM" yaml:"IPAM" toml:"IPAM"`
IPAM *IPAMOptions `json:"IPAM,omitempty" yaml:"IPAM" toml:"IPAM"`
Options map[string]interface{} `json:"Options" yaml:"Options" toml:"Options"`
Labels map[string]string `json:"Labels" yaml:"Labels" toml:"Labels"`
CheckDuplicate bool `json:"CheckDuplicate" yaml:"CheckDuplicate" toml:"CheckDuplicate"`

6
vendor/vendor.json vendored
View File

@ -561,10 +561,10 @@
"revisionTime": "2016-07-19T20:45:16Z"
},
{
"checksumSHA1": "Fo+DksVXnYQULqol7d07WDAtSMg=",
"checksumSHA1": "E+wmSQrc/BXzgITrbNAbUzljoiM=",
"path": "github.com/fsouza/go-dockerclient",
"revision": "f06d891e0d0f000caf614fa8c670985434ae2df2",
"revisionTime": "2017-11-14T14:45:54Z"
"revision": "5ffdfff51ec0eba739b1039e65ba3625ef25f7c0",
"revisionTime": "2017-11-23T03:37:03Z"
},
{
"comment": "v1.8.5-2-g6ec4abd",