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

Merge pull request #502 from wking/optional-linux-solaris 

specs-go/config: Make Linux and Solaris omitempty (again)
This commit is contained in:
Michael Crosby 2016-06-24 15:39:51 -07:00 committed by GitHub
parent 0473c7e6f1 63231576ec
commit b45aa77484
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
specs-go/config.go
View File

@ -22,9 +22,9 @@ type Spec struct {
Annotations map[string]string `json:"annotations,omitempty"`
// Linux is platform specific configuration for Linux based containers.
Linux Linux `json:"linux" platform:"linux,omitempty"`
Linux *Linux `json:"linux,omitempty" platform:"linux"`
// Solaris is platform specific configuration for Solaris containers.
Solaris Solaris `json:"solaris" platform:"solaris,omitempty"`
Solaris *Solaris `json:"solaris,omitempty" platform:"solaris"`
}
// Process contains information to start a specific application inside the container.
@ -371,9 +371,9 @@ type Solaris struct {
// Specification for automatic creation of network resources for this container.
Anet []Anet `json:"anet,omitempty"`
// Set limit on the amount of CPU time that can be used by container.
CappedCPU CappedCPU `json:"cappedCPU,omitempty"`
CappedCPU *CappedCPU `json:"cappedCPU,omitempty"`
// The physical and swap caps on the memory that can be used by this container.
CappedMemory CappedMemory `json:"cappedMemory,omitempty"`
CappedMemory *CappedMemory `json:"cappedMemory,omitempty"`
}
// CappedCPU allows users to set limit on the amount of CPU time that can be used by container.