cri-o · runcom · Apr 13, 2017 · Apr 12, 2017
diff --git a/Dockerfile b/Dockerfile
@@ -43,13 +43,12 @@ RUN mkdir -p /usr/src/criu \
     && rm -rf /usr/src/criu
 
 # Install runc
-# TODO: This should actually be v1.0.0-rc3 but we first need to switch to
-#       v1.0.0-rc5 runtime config generation.
-ENV RUNC_COMMIT 31980a53ae7887b2c8f8715d13c3eb486c27b6cf
+ENV RUNC_COMMIT v1.0.0-rc3
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \
 	&& cd "$GOPATH/src/github.com/opencontainers/runc" \
+	&& git fetch origin --tags \
 	&& git checkout -q "$RUNC_COMMIT" \
 	&& make static BUILDTAGS="seccomp selinux" \
 	&& cp runc /usr/local/bin/runc \

diff --git a/lock.json b/lock.json
@@ -1,5 +1,5 @@
 {
-    "memo": "1290be673a75036ce5bea81021073dd7041dc3f421446912b6b7ae0ed511fe93",
+    "memo": "0d3077faf280e4e13e18e56f085053d4ced593c2fcfcb09d7df1aea8f0bba403",
     "projects": [
         {
             "name": "github.com/BurntSushi/toml",
@@ -35,6 +35,14 @@
                 "."
             ]
         },
+        {
+            "name": "github.com/blang/semver",
+            "version": "v3.5.0",
+            "revision": "b38d23b8782a487059e8fc8773e9a5b228a77cb6",
+            "packages": [
+                "."
+            ]
+        },
         {
             "name": "github.com/containernetworking/cni",
             "version": "v0.4.0",
@@ -325,19 +333,20 @@
         },
         {
             "name": "github.com/opencontainers/runtime-spec",
-            "branch": "master",
-            "revision": "bb6925ea99f0e366a3f7d1c975f6577475ca25f0",
+            "version": "v1.0.0-rc5",
+            "revision": "035da1dca3dfbb00d752eb58b0b158d6129f3776",
             "packages": [
                 "specs-go"
             ]
         },
         {
             "name": "github.com/opencontainers/runtime-tools",
             "branch": "master",
-            "revision": "2d92f6557e64d4f9a0e799a75fdf153cec13dffa",
+            "revision": "18a122b45a71765b09c6a451008a63687040b74a",
             "packages": [
                 "generate",
-                "generate/seccomp"
+                "generate/seccomp",
+                "validate"
             ]
         },
         {

diff --git a/manifest.json b/manifest.json
@@ -22,6 +22,9 @@
             "branch": "master"
         },
         "github.com/opencontainers/runtime-spec": {
+            "version": "v1.0.0-rc5"
+        },
+        "github.com/opencontainers/runtime-tools": {
             "branch": "master"
         },
         "github.com/opencontainers/selinux": {

diff --git a/server/container_create.go b/server/container_create.go
@@ -365,7 +365,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
 
 			cpuQuota := resources.CpuQuota
 			if cpuQuota != 0 {
-				specgen.SetLinuxResourcesCPUQuota(uint64(cpuQuota))
+				specgen.SetLinuxResourcesCPUQuota(cpuQuota)
 			}
 
 			cpuShares := resources.CpuShares

diff --git a/server/seccomp/seccomp.go b/server/seccomp/seccomp.go
@@ -75,7 +75,7 @@ func setupSeccomp(config *Seccomp, specgen *generate.Generator) error {
 	}
 
 	customspec := specgen.Spec()
-	customspec.Linux.Seccomp = &specs.Seccomp{}
+	customspec.Linux.Seccomp = &specs.LinuxSeccomp{}
 
 	// if config.Architectures == 0 then libseccomp will figure out the architecture to use
 	if len(config.Architectures) != 0 {
@@ -99,7 +99,7 @@ func setupSeccomp(config *Seccomp, specgen *generate.Generator) error {
 		}
 	}
 
-	customspec.Linux.Seccomp.DefaultAction = specs.Action(config.DefaultAction)
+	customspec.Linux.Seccomp.DefaultAction = specs.LinuxSeccompAction(config.DefaultAction)
 
 Loop:
 	// Loop through all syscall blocks and convert them to libcontainer format after filtering them
@@ -111,7 +111,7 @@ Loop:
 		}
 		if len(call.Excludes.Caps) > 0 {
 			for _, c := range call.Excludes.Caps {
-				if stringutils.InSlice(customspec.Process.Capabilities, c) {
+				if stringutils.InSlice(customspec.Process.Capabilities.Permitted, c) {
 					continue Loop
 				}
 			}
@@ -123,7 +123,7 @@ Loop:
 		}
 		if len(call.Includes.Caps) > 0 {
 			for _, c := range call.Includes.Caps {
-				if !stringutils.InSlice(customspec.Process.Capabilities, c) {
+				if !stringutils.InSlice(customspec.Process.Capabilities.Permitted, c) {
 					continue Loop
 				}
 			}
@@ -145,19 +145,19 @@ Loop:
 	return nil
 }
 
-func createSpecsSyscall(name string, action Action, args []*Arg) specs.Syscall {
-	newCall := specs.Syscall{
-		Name:   name,
-		Action: specs.Action(action),
+func createSpecsSyscall(name string, action Action, args []*Arg) specs.LinuxSyscall {
+	newCall := specs.LinuxSyscall{
+		Names:  []string{name},
+		Action: specs.LinuxSeccompAction(action),
 	}
 
 	// Loop through all the arguments of the syscall and convert them
 	for _, arg := range args {
-		newArg := specs.Arg{
+		newArg := specs.LinuxSeccompArg{
 			Index:    arg.Index,
 			Value:    arg.Value,
 			ValueTwo: arg.ValueTwo,
-			Op:       specs.Operator(arg.Op),
+			Op:       specs.LinuxSeccompOperator(arg.Op),
 		}
 
 		newCall.Args = append(newCall.Args, newArg)

diff --git a/vendor/github.com/blang/semver/.gx/lastpubver b/vendor/github.com/blang/semver/.gx/lastpubver
diff --git a/...space/src/github.com/blang/semver/LICENSE → vendor/github.com/blang/semver/LICENSE b/...space/src/github.com/blang/semver/LICENSE → vendor/github.com/blang/semver/LICENSE
diff --git a/...ace/src/github.com/blang/semver/README.md → vendor/github.com/blang/semver/README.md b/...ace/src/github.com/blang/semver/README.md → vendor/github.com/blang/semver/README.md
diff --git a/.../github.com/blang/semver/examples/main.go → .../github.com/blang/semver/examples/main.go b/.../github.com/blang/semver/examples/main.go → .../github.com/blang/semver/examples/main.go
diff --git a/...space/src/github.com/blang/semver/json.go → vendor/github.com/blang/semver/json.go b/...space/src/github.com/blang/semver/json.go → vendor/github.com/blang/semver/json.go
diff --git a/.../src/github.com/blang/semver/json_test.go → vendor/github.com/blang/semver/json_test.go b/.../src/github.com/blang/semver/json_test.go → vendor/github.com/blang/semver/json_test.go
diff --git a/vendor/github.com/blang/semver/package.json b/vendor/github.com/blang/semver/package.json