jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #431 from wking/platform-specific-solaris 

specs-go/config: Make Linux and Solaris omitempty
This commit is contained in:
Mrunal Patel 2016-05-09 13:18:46 -07:00
parent 040712af18 5c2193f357
commit adea03f51c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.md
View File

@ -207,6 +207,8 @@ _Note: For Solaris, uid and gid specify the uid and gid of the process inside th
* **`linux`** (object, optional) [Linux-specific configuration](config-linux.md). * **`linux`** (object, optional) [Linux-specific configuration](config-linux.md).
This should only be set if **`platform.os`** is `linux`. This should only be set if **`platform.os`** is `linux`.
* **`solaris`** (object, optional) [Solaris-specific configuration](config-solaris.md).
This should only be set if **`platform.os`** is `solaris`.
### Example (Linux) ### Example (Linux)

4
specs-go/config.go
View File

@ -24,9 +24,9 @@ type Spec struct {
Annotations map[string]string `json:"annotations,omitempty"` Annotations map[string]string `json:"annotations,omitempty"`
// Linux is platform specific configuration for Linux based containers. // Linux is platform specific configuration for Linux based containers.
Linux Linux `json:"linux" platform:"linux"` Linux Linux `json:"linux" platform:"linux,omitempty"`
// Solaris is platform specific configuration for Solaris containers. // Solaris is platform specific configuration for Solaris containers.
Solaris Solaris `json:"solaris" platform:"solaris"` Solaris Solaris `json:"solaris" platform:"solaris,omitempty"`
} }
// Process contains information to start a specific application inside the container. // Process contains information to start a specific application inside the container.