Skip to content

Commit 868323a

Browse files
author
Ma Shimiao
authored
Merge pull request #349 from q384566678/up-version
update runtime-spec version
2 parents 133b953 + afc8d35 commit 868323a

File tree

19 files changed

+1052
-2016
lines changed

19 files changed

+1052
-2016
lines changed

Godeps/Godeps.json

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/config.go

Lines changed: 222 additions & 140 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/state.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/opencontainers/runtime-spec/specs-go/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/syndtr/gocapability/capability/capability_linux.go

Lines changed: 46 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/syndtr/gocapability/capability/enum.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/syndtr/gocapability/capability/syscall_linux.go

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/oci-runtime-tool/generate.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ var generateFlags = []cli.Flag{
5252
cli.IntFlag{Name: "linux-network-classid", Usage: "specifies class identifier tagged by container's network packets"},
5353
cli.StringSliceFlag{Name: "linux-network-priorities", Usage: "specifies priorities of network traffic"},
5454
cli.Int64Flag{Name: "linux-pids-limit", Usage: "maximum number of PIDs"},
55-
cli.Uint64Flag{Name: "linux-realtime-period", Usage: "CPU period to be used for realtime scheduling (in usecs)"},
56-
cli.Uint64Flag{Name: "linux-realtime-runtime", Usage: "the time realtime scheduling may use (in usecs)"},
55+
cli.Int64Flag{Name: "linux-realtime-period", Usage: "CPU period to be used for realtime scheduling (in usecs)"},
56+
cli.Int64Flag{Name: "linux-realtime-runtime", Usage: "the time realtime scheduling may use (in usecs)"},
5757
cli.StringSliceFlag{Name: "masked-paths", Usage: "specifies paths can not be read inside container"},
5858
cli.StringFlag{Name: "mount-cgroups", Value: "no", Usage: "mount cgroups (rw,ro,no)"},
5959
cli.StringFlag{Name: "mount-label", Usage: "selinux mount context label"},
@@ -385,11 +385,11 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
385385
}
386386

387387
if context.IsSet("linux-cpu-quota") {
388-
g.SetLinuxResourcesCPUQuota(context.Uint64("linux-cpu-quota"))
388+
g.SetLinuxResourcesCPUQuota(context.Int64("linux-cpu-quota"))
389389
}
390390

391391
if context.IsSet("linux-realtime-runtime") {
392-
g.SetLinuxResourcesCPURealtimeRuntime(context.Uint64("linux-realtime-runtime"))
392+
g.SetLinuxResourcesCPURealtimeRuntime(context.Int64("linux-realtime-runtime"))
393393
}
394394

395395
if context.IsSet("linux-pids-limit") {
@@ -644,7 +644,7 @@ var deviceType = map[string]bool{
644644

645645
// addDevice takes the raw string passed with the --device flag, parses it, and add it
646646
func addDevice(device string, g *generate.Generator) error {
647-
dev := rspec.Device{}
647+
dev := rspec.LinuxDevice{}
648648

649649
// The required part and optional part are separated by ":"
650650
argsParts := strings.Split(device, ":")

0 commit comments

Comments
 (0)