Restored dockerd from merge

2013-02-13 17:40:10 -08:00 · 2013-02-13 17:40:10 -08:00 · 24ee152481
parent 2f84bab879
commit 24ee152481
1 changed files with 24 additions and 0 deletions
--- a/dockerd/dockerd.go
+++ b/dockerd/dockerd.go
@ -0,0 +1,24 @@
+package main
+
+import (
+	"log"
+	"flag"
+	"github.com/dotcloud/docker/server"
+	"github.com/dotcloud/docker"
+)
+
+func main() {
+	if docker.SelfPath() == "/sbin/init" {
+		// Running in init mode
+		docker.SysInit()
+		return
+	}
+	flag.Parse()
+	d, err := server.New()
+	if err != nil {
+		log.Fatal(err)
+	}
+	if err := d.ListenAndServe(); err != nil {
+		log.Fatal(err)
+	}
+}