Merge pull request #1088 from crosbymichael/rc2
Bump spec and version to rc2
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 455dffb..152246d 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,7 @@
{
"ImportPath": "github.com/opencontainers/runc",
"GoVersion": "go1.5.3",
+ "GodepVersion": "v74",
"Deps": [
{
"ImportPath": "github.com/Sirupsen/logrus",
@@ -58,8 +59,8 @@
},
{
"ImportPath": "github.com/opencontainers/runtime-spec/specs-go",
- "Comment": "v1.0.0-rc1-89-g7a36e7e",
- "Rev": "7a36e7ed86ee3b4c6dbcdbd02052ec1ef6787c3c"
+ "Comment": "v1.0.0-rc2-38-g1c7c27d",
+ "Rev": "1c7c27d043c2a5e513a44084d2b10d77d1402b8c"
},
{
"ImportPath": "github.com/seccomp/libseccomp-golang",
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go b/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go
index de42035..491b734 100644
--- a/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go
+++ b/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go
@@ -25,12 +25,16 @@
Linux *Linux `json:"linux,omitempty" platform:"linux"`
// Solaris is platform specific configuration for Solaris containers.
Solaris *Solaris `json:"solaris,omitempty" platform:"solaris"`
+ // Windows is platform specific configuration for Windows based containers, including Hyper-V containers.
+ Windows *Windows `json:"windows,omitempty" platform:"windows"`
}
// Process contains information to start a specific application inside the container.
type Process struct {
// Terminal creates an interactive terminal for the container.
Terminal bool `json:"terminal,omitempty"`
+ // ConsoleSize specifies the size of the console.
+ ConsoleSize Box `json:"consoleSize,omitempty"`
// User specifies user information for the process.
User User `json:"user"`
// Args specifies the binary and arguments for the application to execute.
@@ -43,25 +47,33 @@
// Capabilities are Linux capabilities that are kept for the container.
Capabilities []string `json:"capabilities,omitempty" platform:"linux"`
// Rlimits specifies rlimit options to apply to the process.
- Rlimits []Rlimit `json:"rlimits,omitempty"`
+ Rlimits []Rlimit `json:"rlimits,omitempty" platform:"linux"`
// NoNewPrivileges controls whether additional privileges could be gained by processes in the container.
- NoNewPrivileges bool `json:"noNewPrivileges,omitempty"`
-
- // ApparmorProfile specifies the apparmor profile for the container. (this field is platform dependent)
+ NoNewPrivileges bool `json:"noNewPrivileges,omitempty" platform:"linux"`
+ // ApparmorProfile specifies the apparmor profile for the container.
ApparmorProfile string `json:"apparmorProfile,omitempty" platform:"linux"`
- // SelinuxLabel specifies the selinux context that the container process is run as. (this field is platform dependent)
+ // SelinuxLabel specifies the selinux context that the container process is run as.
SelinuxLabel string `json:"selinuxLabel,omitempty" platform:"linux"`
}
-// User specifies Linux/Solaris specific user and group information
-// for the container process.
+// Box specifies dimensions of a rectangle. Used for specifying the size of a console.
+type Box struct {
+ // Height is the vertical dimension of a box.
+ Height uint `json:"height"`
+ // Width is the horizontal dimension of a box.
+ Width uint `json:"width"`
+}
+
+// User specifies specific user (and group) information for the container process.
type User struct {
- // UID is the user id. (this field is platform dependent)
+ // UID is the user id.
UID uint32 `json:"uid" platform:"linux,solaris"`
- // GID is the group id. (this field is platform dependent)
+ // GID is the group id.
GID uint32 `json:"gid" platform:"linux,solaris"`
- // AdditionalGids are additional group ids set for the container's process. (this field is platform dependent)
+ // AdditionalGids are additional group ids set for the container's process.
AdditionalGids []uint32 `json:"additionalGids,omitempty" platform:"linux,solaris"`
+ // Username is the user name.
+ Username string `json:"username,omitempty" platform:"windows"`
}
// Root contains information about the container's root filesystem on the host.
@@ -405,6 +417,58 @@
Macaddress string `json:"macAddress,omitempty"`
}
+// Windows defines the runtime configuration for Windows based containers, including Hyper-V containers.
+type Windows struct {
+ // Resources contains information for handling resource constraints for the container.
+ Resources *WindowsResources `json:"resources,omitempty"`
+}
+
+// WindowsResources has container runtime resource constraints for containers running on Windows.
+type WindowsResources struct {
+ // Memory restriction configuration.
+ Memory *WindowsMemoryResources `json:"memory,omitempty"`
+ // CPU resource restriction configuration.
+ CPU *WindowsCPUResources `json:"cpu,omitempty"`
+ // Storage restriction configuration.
+ Storage *WindowsStorageResources `json:"storage,omitempty"`
+ // Network restriction configuration.
+ Network *WindowsNetworkResources `json:"network,omitempty"`
+}
+
+// WindowsMemoryResources contains memory resource management settings.
+type WindowsMemoryResources struct {
+ // Memory limit in bytes.
+ Limit *uint64 `json:"limit,omitempty"`
+ // Memory reservation in bytes.
+ Reservation *uint64 `json:"reservation,omitempty"`
+}
+
+// WindowsCPUResources contains CPU resource management settings.
+type WindowsCPUResources struct {
+ // Number of CPUs available to the container.
+ Count *uint64 `json:"count,omitempty"`
+ // CPU shares (relative weight to other containers with cpu shares). Range is from 1 to 10000.
+ Shares *uint16 `json:"shares,omitempty"`
+ // Percent of available CPUs usable by the container.
+ Percent *uint8 `json:"percent,omitempty"`
+}
+
+// WindowsStorageResources contains storage resource management settings.
+type WindowsStorageResources struct {
+ // Specifies maximum Iops for the system drive.
+ Iops *uint64 `json:"iops,omitempty"`
+ // Specifies maximum bytes per second for the system drive.
+ Bps *uint64 `json:"bps,omitempty"`
+ // Sandbox size specifies the minimum size of the system drive in bytes.
+ SandboxSize *uint64 `json:"sandboxSize,omitempty"`
+}
+
+// WindowsNetworkResources contains network resource management settings.
+type WindowsNetworkResources struct {
+ // EgressBandwidth is the maximum egress bandwidth in bytes per second.
+ EgressBandwidth *uint64 `json:"egressBandwidth,omitempty"`
+}
+
// Arch used for additional architectures
type Arch string
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go b/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go
index 2db1b80..8b5ec89 100644
--- a/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go
+++ b/Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go
@@ -11,7 +11,7 @@
VersionPatch = 0
// VersionDev indicates development branch. Releases will be empty string.
- VersionDev = "-rc1-dev"
+ VersionDev = "-rc2-dev"
)
// Version is the specification version that the package types support.
diff --git a/VERSION b/VERSION
index 867bf6b..2136ac9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0-rc1
+1.0.0-rc2
