diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-25 15:43:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 15:43:25 +0100 |
| commit | 3d37dc639d87e4469a6457cf4592ff5b773d0777 (patch) | |
| tree | f487a0db671b5303286a935b58577b0d50c64ab9 /vendor/github.com/fsouza/go-dockerclient/container.go | |
| parent | 6babc9f20ca9e3633da1792a31d0391bde6201b6 (diff) | |
| parent | 68c313911e8a3aed605a12398442212b99f41619 (diff) | |
| download | podman-3d37dc639d87e4469a6457cf4592ff5b773d0777.tar.gz podman-3d37dc639d87e4469a6457cf4592ff5b773d0777.tar.bz2 podman-3d37dc639d87e4469a6457cf4592ff5b773d0777.zip | |
Merge pull request #5297 from rhatdan/vendor
Update vendor of buildah and containers/common
Diffstat (limited to 'vendor/github.com/fsouza/go-dockerclient/container.go')
| -rw-r--r-- | vendor/github.com/fsouza/go-dockerclient/container.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/vendor/github.com/fsouza/go-dockerclient/container.go b/vendor/github.com/fsouza/go-dockerclient/container.go index 067755211..309955fd5 100644 --- a/vendor/github.com/fsouza/go-dockerclient/container.go +++ b/vendor/github.com/fsouza/go-dockerclient/container.go @@ -730,6 +730,15 @@ type Device struct { CgroupPermissions string `json:"CgroupPermissions,omitempty" yaml:"CgroupPermissions,omitempty" toml:"CgroupPermissions,omitempty"` } +// A list of requests for devices to be sent to device drivers +type DeviceRequest struct { + Driver string `json:"Driver,omitempty" yaml:"Driver,omitempty" toml:"Driver,omitempty"` + Count int `json:"Count,omitempty" yaml:"Count,omitempty" toml:"Count,omitempty"` + DeviceIDs []string `json:"DeviceIDs,omitempty" yaml:"DeviceIDs,omitempty" toml:"DeviceIDs,omitempty"` + Capabilities [][]string `json:"Capabilities,omitempty" yaml:"Capabilities,omitempty" toml:"Capabilities,omitempty"` + Options map[string]string `json:"Options,omitempty" yaml:"Options,omitempty" toml:"Options,omitempty"` +} + // BlockWeight represents a relative device weight for an individual device inside // of a container type BlockWeight struct { @@ -771,6 +780,7 @@ type HostConfig struct { RestartPolicy RestartPolicy `json:"RestartPolicy,omitempty" yaml:"RestartPolicy,omitempty" toml:"RestartPolicy,omitempty"` Devices []Device `json:"Devices,omitempty" yaml:"Devices,omitempty" toml:"Devices,omitempty"` DeviceCgroupRules []string `json:"DeviceCgroupRules,omitempty" yaml:"DeviceCgroupRules,omitempty" toml:"DeviceCgroupRules,omitempty"` + DeviceRequests []DeviceRequest `json:"DeviceRequests,omitempty" yaml:"DeviceRequests,omitempty" toml:"DeviceRequests,omitempty"` LogConfig LogConfig `json:"LogConfig,omitempty" yaml:"LogConfig,omitempty" toml:"LogConfig,omitempty"` SecurityOpt []string `json:"SecurityOpt,omitempty" yaml:"SecurityOpt,omitempty" toml:"SecurityOpt,omitempty"` CgroupnsMode string `json:"CgroupnsMode,omitempty" yaml:"CgroupnsMode,omitempty" toml:"CgroupnsMode,omitempty"` // v1.40+ |