Permalink
Browse files

Update spec to 239c4e4

This provides updates to runc for the spec changes with *Process and
OOMScoreAdj

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
  • Loading branch information...
crosbymichael committed Jun 1, 2017
1 parent a6906d5 commit 854b41d81ea911967b8277a4f641e82aa22e46b3
View
@@ -208,5 +208,5 @@ func getProcess(context *cli.Context, bundle string) (*specs.Process, error) {
}
p.User.UID = uint32(uid)
}
return &p, nil
return p, nil
}
@@ -23,7 +23,7 @@ func Example() *specs.Spec {
Path: "rootfs",
Readonly: true,
},
Process: specs.Process{
Process: &specs.Process{
Terminal: true,
User: specs.User{},
Args: []string{
@@ -230,8 +230,8 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) {
config.ProcessLabel = spec.Process.SelinuxLabel
}
config.Sysctl = spec.Linux.Sysctl
if spec.Linux.Resources != nil && spec.Linux.Resources.OOMScoreAdj != nil {
config.OomScoreAdj = *spec.Linux.Resources.OOMScoreAdj
if spec.Process != nil && spec.Process.OOMScoreAdj != nil {
config.OomScoreAdj = *spec.Process.OOMScoreAdj
}
if spec.Process.Capabilities != nil {
config.Capabilities = &configs.Capabilities{
View
@@ -134,7 +134,7 @@ func loadSpec(cPath string) (spec *specs.Spec, err error) {
if err = validatePlatform(&spec.Platform); err != nil {
return nil, err
}
return spec, validateProcessSpec(&spec.Process)
return spec, validateProcessSpec(spec.Process)
}
func createLibContainerRlimit(rlimit specs.LinuxRlimit) (configs.Rlimit, error) {
@@ -31,7 +31,7 @@ function setup() {
"cpus": "0"
},
"blockio": {
"blkioWeight": 1000
"weight": 1000
},
"pids": {
"limit": 20
@@ -184,7 +184,7 @@ function check_cgroup_value() {
"cpus": "0"
},
"blockIO": {
"blkioWeight": 1000
"weight": 1000
},
"pids": {
"limit": 20
@@ -235,7 +235,7 @@ EOF
"cpus": "0"
},
"blockIO": {
"blkioWeight": 1000
"weight": 1000
},
"pids": {
"limit": 20
View
@@ -47,7 +47,7 @@ The accepted format is as follow (unchanged values can be omitted):
"mems": ""
},
"blockIO": {
"blkioWeight": 0
"weight": 0
}
}
View
@@ -392,5 +392,5 @@ func startContainer(context *cli.Context, spec *specs.Spec, action CtAct, criuOp
action: action,
criuOpts: criuOpts,
}
return r.run(&spec.Process)
return r.run(spec.Process)
}
View
@@ -1,7 +1,7 @@
# OCI runtime-spec. When updating this, make sure you use a version tag rather
# than a commit ID so it's much more obvious what version of the spec we are
# using.
github.com/opencontainers/runtime-spec v1.0.0-rc5
github.com/opencontainers/runtime-spec 239c4e44f2a612ed85f6db9c66247aa33f437e91
# Core libcontainer functionality.
github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08
github.com/opencontainers/selinux v1.0.0-rc1

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 854b41d

Please sign in to comment.