update runtime-spec version

Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>

Author: zhouhao

Godeps/Godeps.json

@@ -22,8 +22,6 @@ var generateFlags = []cli.Flag{
 	cli.StringFlag{Name: "arch", Value: runtime.GOARCH, Usage: "architecture the container is created for"},
 	cli.StringSliceFlag{Name: "args", Usage: "command to run in the container"},
 	cli.StringSliceFlag{Name: "bind", Usage: "bind mount directories src:dest[:options...]"},
-	cli.StringSliceFlag{Name: "cap-add", Usage: "add Linux capabilities"},
-	cli.StringSliceFlag{Name: "cap-drop", Usage: "drop Linux capabilities"},
 	cli.StringFlag{Name: "cgroups-path", Usage: "specify the path to the cgroups"},
 	cli.StringFlag{Name: "cwd", Value: "/", Usage: "current working directory for the process"},
 	cli.StringSliceFlag{Name: "device", Usage: "specifies a device which must be made available in the container"},
@@ -52,8 +50,8 @@ var generateFlags = []cli.Flag{
 	cli.IntFlag{Name: "linux-network-classid", Usage: "specifies class identifier tagged by container's network packets"},
 	cli.StringSliceFlag{Name: "linux-network-priorities", Usage: "specifies priorities of network traffic"},
 	cli.Int64Flag{Name: "linux-pids-limit", Usage: "maximum number of PIDs"},
-	cli.Uint64Flag{Name: "linux-realtime-period", Usage: "CPU period to be used for realtime scheduling (in usecs)"},
-	cli.Uint64Flag{Name: "linux-realtime-runtime", Usage: "the time realtime scheduling may use (in usecs)"},
+	cli.Int64Flag{Name: "linux-realtime-period", Usage: "CPU period to be used for realtime scheduling (in usecs)"},
+	cli.Int64Flag{Name: "linux-realtime-runtime", Usage: "the time realtime scheduling may use (in usecs)"},
 	cli.StringSliceFlag{Name: "masked-paths", Usage: "specifies paths can not be read inside container"},
 	cli.StringFlag{Name: "mount-cgroups", Value: "no", Usage: "mount cgroups (rw,ro,no)"},
 	cli.StringFlag{Name: "mount-label", Usage: "selinux mount context label"},
@@ -259,24 +257,6 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 
 	g.SetupPrivileged(context.Bool("privileged"))
 
-	if context.IsSet("cap-add") {
-		addCaps := context.StringSlice("cap-add")
-		for _, cap := range addCaps {
-			if err := g.AddProcessCapability(cap); err != nil {
-				return err
-			}
-		}
-	}
-
-	if context.IsSet("cap-drop") {
-		dropCaps := context.StringSlice("cap-drop")
-		for _, cap := range dropCaps {
-			if err := g.DropProcessCapability(cap); err != nil {
-				return err
-			}
-		}
-	}
-
 	var uidMaps, gidMaps []string
 
 	if context.IsSet("uidmappings") {
@@ -385,11 +365,11 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 	}
 
 	if context.IsSet("linux-cpu-quota") {
-		g.SetLinuxResourcesCPUQuota(context.Uint64("linux-cpu-quota"))
+		g.SetLinuxResourcesCPUQuota(context.Int64("linux-cpu-quota"))
 	}
 
 	if context.IsSet("linux-realtime-runtime") {
-		g.SetLinuxResourcesCPURealtimeRuntime(context.Uint64("linux-realtime-runtime"))
+		g.SetLinuxResourcesCPURealtimeRuntime(context.Int64("linux-realtime-runtime"))
 	}
 
 	if context.IsSet("linux-pids-limit") {
@@ -644,7 +624,7 @@ var deviceType = map[string]bool{
 
 // addDevice takes the raw string passed with the --device flag, parses it, and add it
 func addDevice(device string, g *generate.Generator) error {
-	dev := rspec.Device{}
+	dev := rspec.LinuxDevice{}
 
 	// The required part and optional part are separated by ":"
 	argsParts := strings.Split(device, ":")