Create linux spec for runc spec command

Signed-off-by: Michael Crosby <[email protected]>
kolyshkin · Jul 2, 2015 · 845fc65 · 845fc65
1 parent f4c35e7
commit 845fc65
Show file tree

Hide file tree

Showing 6 changed files with 416 additions and 348 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,13 @@ to have a v1 of the spec out within a quick timeframe of a few weeks, ~July 2015
 so the `runc` config format will be constantly changing until
 the spec is finalized.  However, we encourage you to try out the tool and give feedback.
 
+### OCF
+
+How does `runc` integrate with the Open Container Format?  `runc` depends on the types
+specified in the [specs](https://github.com/opencontainers/specs) repository.  Whenever
+the specification is updated and ready to be versioned `runc` will update it's dependency
+on the specs repository and support the update spec.
+
 ### Building:
 
 ```bash
@@ -42,7 +49,7 @@ user named `daemon` defined within that file-system.
 
 ```json
 {
-    "version": "0.1.1",
+    "version": "pre-draft",
     "platform": {
         "os": "linux",
         "arch": "amd64"
@@ -107,21 +114,61 @@ user named `daemon` defined within that file-system.
         }
     ],
     "linux": {
+        "uidMapping": null,
+        "gidMapping": null,
+        "rlimits": null,
+        "systemProperties": null,
+        "resources": {
+            "disableOOMKiller": false,
+            "memory": {
+                "limit": 0,
+                "reservation": 0,
+                "swap": 0,
+                "kernel": 0
+            },
+            "cpu": {
+                "shares": 0,
+                "quota": 0,
+                "period": 0,
+                "realtimeRuntime": 0,
+                "realtimePeriod": 0,
+                "cpus": "",
+                "mems": ""
+            },
+            "blockIO": {
+                "blkioWeight": 0,
+                "blkioWeightDevice": "",
+                "blkioThrottleReadBpsDevice": "",
+                "blkioThrottleWriteBpsDevice": "",
+                "blkioThrottleReadIopsDevice": "",
+                "blkioThrottleWriteIopsDevice": ""
+            },
+            "hugepageLimits": null,
+            "network": {
+                "classId": "",
+                "priorities": null
+            }
+        },
         "namespaces": [
             {
-                "type": "process"
+                "type": "process",
+                "path": ""
             },
             {
-                "type": "network"
+                "type": "network",
+                "path": ""
             },
             {
-                "type": "mount"
+                "type": "ipc",
+                "path": ""
             },
             {
-                "type": "ipc"
+                "type": "uts",
+                "path": ""
             },
             {
-                "type": "uts"
+                "type": "mount",
+                "path": ""
             }
         ],
         "capabilities": [

diff --git a/main.go b/main.go
@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	version = "0.1.1"
+	version = "0.2"
 	usage   = `Open Container Project runtime
 
 runc is a command line client for running applications packaged according to the Open Container Format (OCF) and is

diff --git a/main_unsupported.go b/main_unsupported.go
@@ -7,10 +7,6 @@ import (
 	"github.com/codegangsta/cli"
 )
 
-type User struct {
-	NOTSUPPORTED string
-}
-
 func getDefaultID() string {
 	return ""
 }
@@ -19,6 +15,7 @@ var (
 	checkpointCommand cli.Command
 	eventsCommand     cli.Command
 	restoreCommand    cli.Command
+	specCommand       cli.Command
 )
 
 func runAction(*cli.Context) {