migrate to upstream libcompose in one and a half go

vendor/github.com/opencontainers/runc/main.go

@@ -5,24 +5,30 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/codegangsta/cli"
+	"github.com/opencontainers/specs"
 )
 
 const (
-	version = "0.2"
-	usage   = `Open Container Project runtime
+	version = "0.3"
+	usage   = `Open Container Initiative runtime
 
-runc is a command line client for running applications packaged according to the Open Container Format (OCF) and is
-a compliant implementation of the Open Container Project specification.
+runc is a command line client for running applications packaged according to
+the Open Container Format (OCF) and is a compliant implementation of the
+Open Container Initiative specification.
 
-runc integrates well with existing process supervisors to provide a production container runtime environment for
-applications. It can be used with your existing process monitoring tools and the container will be spawned as a direct
-child of the process supervisor.
+runc integrates well with existing process supervisors to provide a production
+container runtime environment for applications. It can be used with your
+existing process monitoring tools and the container will be spawned as a
+direct child of the process supervisor.
 
-After creating a spec for your root filesystem with runc, you can execute a simple container in your shell by running:
+After creating config files for your root filesystem with runc, you can execute a
+container in your shell by running:
 
-    cd /mycontainer
-    runc
-`
+    # cd /mycontainer
+    # runc start [ -c spec-config-file ] [ -r runtime-config-file ]
+
+If not specified, the default value for the 'spec-config-file' is 'config.json',
+and the default value for the 'runtime-config-file' is 'runtime.json'.`
 )
 
 func main() {
@@ -40,9 +46,13 @@ func main() {
 			Name:  "debug",
 			Usage: "enable debug output for logging",
 		},
+		cli.StringFlag{
+			Name:  "log",
+			Usage: "set the log file path where internal debug information is written",
+		},
 		cli.StringFlag{
 			Name:  "root",
-			Value: "/run/oci",
+			Value: specs.LinuxStateDirectory,
 			Usage: "root directory for storage of container state (this should be located in tmpfs)",
 		},
 		cli.StringFlag{
@@ -52,20 +62,29 @@ func main() {
 		},
 	}
 	app.Commands = []cli.Command{
+		startCommand,
 		checkpointCommand,
 		eventsCommand,
 		restoreCommand,
+		killCommand,
 		specCommand,
+		pauseCommand,
+		resumeCommand,
+		execCommand,
 	}
 	app.Before = func(context *cli.Context) error {
 		if context.GlobalBool("debug") {
 			logrus.SetLevel(logrus.DebugLevel)
 		}
+		if path := context.GlobalString("log"); path != "" {
+			f, err := os.Create(path)
+			if err != nil {
+				return err
+			}
+			logrus.SetOutput(f)
+		}
 		return nil
 	}
-
-	app.Action = runAction
-
 	if err := app.Run(os.Args); err != nil {
 		logrus.Fatal(err)
 	}