mirror of
https://github.com/rancher/os.git
synced 2025-06-29 08:16:49 +00:00
Godep updates
This commit is contained in:
parent
7bb5e10b12
commit
382ffbcfe8
10
Godeps/Godeps.json
generated
10
Godeps/Godeps.json
generated
@ -205,7 +205,7 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/fsouza/go-dockerclient",
|
||||
"Rev": "f7e250a5d56499f6591bc98fe58b3a6edaf479a8"
|
||||
"Rev": "9d65f5b8a5731a788b8b13634022089a31af45dc"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/guelfey/go.dbus",
|
||||
@ -226,13 +226,13 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/rancherio/rancher-compose/docker",
|
||||
"Comment": "0.1.0-7-g610ec8a",
|
||||
"Rev": "610ec8ab86c2b1a84e474cbf78cc38104ec4e5e4"
|
||||
"Comment": "0.1.0-8-g45c7de3",
|
||||
"Rev": "45c7de3d9b5b106475cf1461df7550bdaab0a9aa"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/rancherio/rancher-compose/project",
|
||||
"Comment": "0.1.0-7-g610ec8a",
|
||||
"Rev": "610ec8ab86c2b1a84e474cbf78cc38104ec4e5e4"
|
||||
"Comment": "0.1.0-8-g45c7de3",
|
||||
"Rev": "45c7de3d9b5b106475cf1461df7550bdaab0a9aa"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/ryanuber/go-glob",
|
||||
|
7
Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go
generated
vendored
7
Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go
generated
vendored
@ -198,6 +198,12 @@ type Config struct {
|
||||
Labels map[string]string `json:"Labels,omitempty" yaml:"Labels,omitempty"`
|
||||
}
|
||||
|
||||
// LogConfig log driver type and configuration
|
||||
type LogConfig struct {
|
||||
Type string `json:"Type,omitempty" yaml:"Type,omitempty"`
|
||||
Config map[string]string `json:"Config,omitempty" yaml:"Config,omitempty"`
|
||||
}
|
||||
|
||||
// SwarmNode containers information about which Swarm node the container is on
|
||||
type SwarmNode struct {
|
||||
ID string `json:"ID,omitempty" yaml:"ID,omitempty"`
|
||||
@ -406,6 +412,7 @@ type HostConfig struct {
|
||||
PidMode string `json:"PidMode,omitempty" yaml:"PidMode,omitempty"`
|
||||
RestartPolicy RestartPolicy `json:"RestartPolicy,omitempty" yaml:"RestartPolicy,omitempty"`
|
||||
Devices []Device `json:"Devices,omitempty" yaml:"Devices,omitempty"`
|
||||
LogConfig LogConfig `json:"LogConfig,omitempty" yaml:"LogConfig,omitempty"`
|
||||
}
|
||||
|
||||
// StartContainer starts a container, returning an error in case of failure.
|
||||
|
15
Godeps/_workspace/src/github.com/rancherio/rancher-compose/docker/factory.go
generated
vendored
15
Godeps/_workspace/src/github.com/rancherio/rancher-compose/docker/factory.go
generated
vendored
@ -31,12 +31,15 @@ func Convert(c *project.ServiceConfig) (*runconfig.Config, *runconfig.HostConfig
|
||||
Labels: kvListToMap(c.Labels),
|
||||
},
|
||||
&runconfig.HostConfig{
|
||||
VolumesFrom: c.VolumesFrom,
|
||||
CapAdd: c.CapAdd,
|
||||
CapDrop: c.CapDrop,
|
||||
Privileged: c.Privileged,
|
||||
Binds: c.Volumes,
|
||||
Dns: c.Dns,
|
||||
VolumesFrom: c.VolumesFrom,
|
||||
CapAdd: c.CapAdd,
|
||||
CapDrop: c.CapDrop,
|
||||
Privileged: c.Privileged,
|
||||
Binds: c.Volumes,
|
||||
Dns: c.Dns,
|
||||
LogConfig: runconfig.LogConfig{
|
||||
Type: c.LogDriver,
|
||||
},
|
||||
NetworkMode: runconfig.NetworkMode(c.Net),
|
||||
ReadonlyRootfs: c.ReadOnly,
|
||||
PidMode: runconfig.PidMode(c.Pid),
|
||||
|
1
Godeps/_workspace/src/github.com/rancherio/rancher-compose/project/types.go
generated
vendored
1
Godeps/_workspace/src/github.com/rancherio/rancher-compose/project/types.go
generated
vendored
@ -35,6 +35,7 @@ type ServiceConfig struct {
|
||||
Image string `yaml:"image,omitempty"`
|
||||
Labels []string `yaml:"labels,omitempty"`
|
||||
Links []string `yaml:"links,omitempty"`
|
||||
LogDriver string `yaml:"log_driver,omitempty"`
|
||||
MemLimit int64 `yaml:"mem_limit,omitempty"`
|
||||
Name string `yaml:"name,omitempty"`
|
||||
Net string `yaml:"net,omitempty"`
|
||||
|
Loading…
Reference in New Issue
Block a user