diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 1ae1322a5..069031488 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -15,8 +15,8 @@ }, { "ImportPath": "github.com/opencontainers/runtime-spec/specs-go", - "Comment": "v1.0.0-rc1-15-g6de52a7", - "Rev": "6de52a7d39c52a1e287182d0b4e6c03068236639" + "Comment": "v1.0.0-rc1-31-gbb6925e", + "Rev": "bb6925ea99f0e366a3f7d1c975f6577475ca25f0" }, { "ImportPath": "github.com/syndtr/gocapability/capability", 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 015e032d0..b2ac75eb4 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 @@ -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. @@ -47,7 +47,7 @@ type Process struct { // NoNewPrivileges controls whether additional privileges could be gained by processes in the container. NoNewPrivileges bool `json:"noNewPrivileges,omitempty"` - // ApparmorProfile specified the apparmor profile for the container. (this field is platform dependent) + // ApparmorProfile specifies the apparmor profile for the container. (this field is platform dependent) 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 string `json:"selinuxLabel,omitempty" platform:"linux"` @@ -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. diff --git a/generate/generate.go b/generate/generate.go index f979e9fc3..56e6b930b 100644 --- a/generate/generate.go +++ b/generate/generate.go @@ -110,7 +110,7 @@ func New() Generator { Options: []string{"nosuid", "noexec", "nodev", "ro"}, }, }, - Linux: rspec.Linux{ + Linux: &rspec.Linux{ Resources: &rspec.Resources{ Devices: []rspec.DeviceCgroup{ {