Skip to content

Commit

Permalink
Merge pull request #526 from wking/optional-devices
Browse files Browse the repository at this point in the history
config-linux: Make Linux 'devices' explicitly optional
  • Loading branch information
hqhq authored Aug 7, 2016
2 parents 95a6ecf + 054d2df commit c9c2574
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions config-linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ There is a limit of 5 mappings which is the Linux kernel hard limit.

## Devices

`devices` is an array specifying the list of devices that MUST be available in the container.
**`devices`** (array, optional) lists devices that MUST be available in the container.
The runtime may supply them however it likes (with [mknod][mknod.2], by bind mounting from the runtime mount namespace, etc.).

The following parameters can be specified:
Expand Down Expand Up @@ -198,7 +198,7 @@ However, a runtime MAY attach the container process to additional cgroup control

#### Device whitelist

`devices` is an array of entries to control the [device whitelist][cgroup-v1-devices].
**`devices`** (array, optional) configures the [device whitelist][cgroup-v1-devices].
The runtime MUST apply entries in the listed order.

The following parameters can be specified:
Expand Down
4 changes: 2 additions & 2 deletions specs-go/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,8 @@ type Network struct {

// Resources has container runtime resource constraints
type Resources struct {
// Devices are a list of device rules for the whitelist controller
Devices []DeviceCgroup `json:"devices"`
// Devices configures the device whitelist.
Devices []DeviceCgroup `json:"devices,omitempty"`
// DisableOOMKiller disables the OOM killer for out of memory conditions
DisableOOMKiller *bool `json:"disableOOMKiller,omitempty"`
// Specify an oom_score_adj for the container.
Expand Down

0 comments on commit c9c2574

Please sign in to comment.