@@ -12,7 +12,8 @@

 .gopath/

 autogen/

 bundles/

-docker/docker

+cmd/dockerd/dockerd

+cmd/docker/docker

 dockerversion/version_autogen.go

 docs/AWS_S3_BUCKET

 docs/GITCOMMIT

deleted file mode 100644

@@ -1,38 +0,0 @@

-package main

-

-import (

-	"path/filepath"

-

-	"github.com/docker/docker/cli"

-	cliflags "github.com/docker/docker/cli/flags"

-	"github.com/docker/docker/cliconfig"

-	flag "github.com/docker/docker/pkg/mflag"

-	"github.com/docker/docker/utils"

-)

-

-var (

-	commonFlags = cliflags.InitCommonFlags()

-	clientFlags = &cli.ClientFlags{FlagSet: new(flag.FlagSet), Common: commonFlags}

-)

-

-func init() {

-

-	client := clientFlags.FlagSet

-	client.StringVar(&clientFlags.ConfigDir, []string{"-config"}, cliconfig.ConfigDir(), "Location of client config files")

-

-	clientFlags.PostParse = func() {

-		clientFlags.Common.PostParse()

-

-		if clientFlags.ConfigDir != "" {

-			cliconfig.SetConfigDir(clientFlags.ConfigDir)

-		}

-

-		if clientFlags.Common.TrustKey == "" {

-			clientFlags.Common.TrustKey = filepath.Join(cliconfig.ConfigDir(), cliflags.DefaultTrustKeyFile)

-		}

-

-		if clientFlags.Common.Debug {

-			utils.EnableDebug()

-		}

-	}

-}

deleted file mode 100644

@@ -1,23 +0,0 @@

-package main

-

-import (

-	"os"

-	"testing"

-

-	"github.com/Sirupsen/logrus"

-	"github.com/docker/docker/utils"

-)

-

-func TestClientDebugEnabled(t *testing.T) {

-	defer utils.DisableDebug()

-

-	clientFlags.Common.FlagSet.Parse([]string{"-D"})

-	clientFlags.PostParse()

-

-	if os.Getenv("DEBUG") != "1" {

-		t.Fatal("expected debug enabled, got false")

-	}

-	if logrus.GetLevel() != logrus.DebugLevel {

-		t.Fatalf("expected logrus debug level, got %v", logrus.GetLevel())

-	}

-}

deleted file mode 100644

@@ -1,11 +0,0 @@

-package main

-

-const daemonBinary = "dockerd"

-

-// DaemonProxy acts as a cli.Handler to proxy calls to the daemon binary

-type DaemonProxy struct{}

-

-// NewDaemonProxy returns a new handler

-func NewDaemonProxy() DaemonProxy {

-	return DaemonProxy{}

-}

deleted file mode 100644

@@ -1,37 +0,0 @@

-// +build !windows

-

-package main

-

-import (

-	"os"

-	"os/exec"

-	"syscall"

-)

-

-// CmdDaemon execs dockerd with the same flags

-// TODO: add a deprecation warning?

-func (p DaemonProxy) CmdDaemon(args ...string) error {

-	// Use os.Args[1:] so that "global" args are passed to dockerd

-	args = stripDaemonArg(os.Args[1:])

-

-	// TODO: check dirname args[0] first

-	binaryAbsPath, err := exec.LookPath(daemonBinary)

-	if err != nil {

-		return err

-	}

-

-	return syscall.Exec(

-		binaryAbsPath,

-		append([]string{daemonBinary}, args...),

-		os.Environ())

-}

-

-// stripDaemonArg removes the `daemon` argument from the list

-func stripDaemonArg(args []string) []string {

-	for i, arg := range args {

-		if arg == "daemon" {

-			return append(args[:i], args[i+1:]...)

-		}

-	}

-	return args

-}

deleted file mode 100644

@@ -1,11 +0,0 @@

-package main

-

-import (

-	"fmt"

-)

-

-// CmdDaemon reports on an error on windows, because there is no exec

-func (p DaemonProxy) CmdDaemon(args ...string) error {

-	return fmt.Errorf(

-		"`docker daemon` does not exist on windows. Please run `dockerd` directly")

-}

deleted file mode 100644

@@ -1,18 +0,0 @@

-package main

-

-import (

-	"strings"

-	"testing"

-)

-

-func TestCmdDaemon(t *testing.T) {

-	proxy := NewDaemonProxy()

-	err := proxy.CmdDaemon("--help")

-	if err == nil {

-		t.Fatal("Expected CmdDaemon to fail in Windows.")

-	}

-

-	if !strings.Contains(err.Error(), "Please run `dockerd`") {

-		t.Fatalf("Expected an error about running dockerd, got %s", err)

-	}

-}

deleted file mode 100644

@@ -1,77 +0,0 @@

-package main

-

-import (

-	"fmt"

-	"os"

-

-	"github.com/Sirupsen/logrus"

-	"github.com/docker/docker/api/client"

-	"github.com/docker/docker/cli"

-	"github.com/docker/docker/dockerversion"

-	flag "github.com/docker/docker/pkg/mflag"

-	"github.com/docker/docker/pkg/term"

-	"github.com/docker/docker/utils"

-)

-

-func main() {

-	// Set terminal emulation based on platform as required.

-	stdin, stdout, stderr := term.StdStreams()

-

-	logrus.SetOutput(stderr)

-

-	flag.Merge(flag.CommandLine, clientFlags.FlagSet, commonFlags.FlagSet)

-

-	flag.Usage = func() {

-		fmt.Fprint(stdout, "Usage: docker [OPTIONS] COMMAND [arg...]\n       docker [ --help | -v | --version ]\n\n")

-		fmt.Fprint(stdout, "A self-sufficient runtime for containers.\n\nOptions:\n")

-

-		flag.CommandLine.SetOutput(stdout)

-		flag.PrintDefaults()

-

-		help := "\nCommands:\n"

-

-		for _, cmd := range dockerCommands {

-			help += fmt.Sprintf("    %-10.10s%s\n", cmd.Name, cmd.Description)

-		}

-

-		help += "\nRun 'docker COMMAND --help' for more information on a command."

-		fmt.Fprintf(stdout, "%s\n", help)

-	}

-

-	flag.Parse()

-

-	if *flVersion {

-		showVersion()

-		return

-	}

-

-	if *flHelp {

-		// if global flag --help is present, regardless of what other options and commands there are,

-		// just print the usage.

-		flag.Usage()

-		return

-	}

-

-	clientCli := client.NewDockerCli(stdin, stdout, stderr, clientFlags)

-

-	c := cli.New(clientCli, NewDaemonProxy())

-	if err := c.Run(flag.Args()...); err != nil {

-		if sterr, ok := err.(cli.StatusError); ok {

-			if sterr.Status != "" {

-				fmt.Fprintln(stderr, sterr.Status)

-				os.Exit(1)

-			}

-			os.Exit(sterr.StatusCode)

-		}

-		fmt.Fprintln(stderr, err)

-		os.Exit(1)

-	}

-}

-

-func showVersion() {

-	if utils.ExperimentalBuild() {

-		fmt.Printf("Docker version %s, build %s, experimental\n", dockerversion.Version, dockerversion.GitCommit)

-	} else {

-		fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)

-	}

-}

deleted file mode 100644

@@ -1,5 +0,0 @@

-package main

-

-import (

-	_ "github.com/docker/docker/autogen/winresources/docker"

-)

deleted file mode 100644

@@ -1,30 +0,0 @@

-package main

-

-import (

-	"sort"

-

-	"github.com/docker/docker/cli"

-	flag "github.com/docker/docker/pkg/mflag"

-)

-

-var (

-	flHelp    = flag.Bool([]string{"h", "-help"}, false, "Print usage")

-	flVersion = flag.Bool([]string{"v", "-version"}, false, "Print version information and quit")

-)

-

-type byName []cli.Command

-

-func (a byName) Len() int           { return len(a) }

-func (a byName) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }

-func (a byName) Less(i, j int) bool { return a[i].Name < a[j].Name }

-

-var dockerCommands []cli.Command

-

-// TODO(tiborvass): do not show 'daemon' on client-only binaries

-

-func init() {

-	for _, cmd := range cli.DockerCommands {

-		dockerCommands = append(dockerCommands, cmd)

-	}

-	sort.Sort(byName(dockerCommands))

-}

deleted file mode 100644

@@ -1,13 +0,0 @@

-package main

-

-import (

-	"sort"

-	"testing"

-)

-

-// Tests if the subcommands of docker are sorted

-func TestDockerSubcommandsAreSorted(t *testing.T) {

-	if !sort.IsSorted(byName(dockerCommands)) {

-		t.Fatal("Docker subcommands are not in sorted order")

-	}

-}

new file mode 100644

@@ -0,0 +1,38 @@

+package main

+

+import (

+	"path/filepath"

+

+	"github.com/docker/docker/cli"

+	cliflags "github.com/docker/docker/cli/flags"

+	"github.com/docker/docker/cliconfig"

+	flag "github.com/docker/docker/pkg/mflag"

+	"github.com/docker/docker/utils"

+)

+

+var (

+	commonFlags = cliflags.InitCommonFlags()

+	clientFlags = &cli.ClientFlags{FlagSet: new(flag.FlagSet), Common: commonFlags}

+)

+

+func init() {

+

+	client := clientFlags.FlagSet

+	client.StringVar(&clientFlags.ConfigDir, []string{"-config"}, cliconfig.ConfigDir(), "Location of client config files")

+

+	clientFlags.PostParse = func() {

+		clientFlags.Common.PostParse()

+

+		if clientFlags.ConfigDir != "" {

+			cliconfig.SetConfigDir(clientFlags.ConfigDir)

+		}

+

+		if clientFlags.Common.TrustKey == "" {

+			clientFlags.Common.TrustKey = filepath.Join(cliconfig.ConfigDir(), cliflags.DefaultTrustKeyFile)

+		}

+

+		if clientFlags.Common.Debug {

+			utils.EnableDebug()

+		}

+	}

+}

new file mode 100644

@@ -0,0 +1,23 @@

+package main

+

+import (

+	"os"

+	"testing"

+

+	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/utils"

+)

+

+func TestClientDebugEnabled(t *testing.T) {

+	defer utils.DisableDebug()

+

+	clientFlags.Common.FlagSet.Parse([]string{"-D"})

+	clientFlags.PostParse()

+

+	if os.Getenv("DEBUG") != "1" {

+		t.Fatal("expected debug enabled, got false")

+	}

+	if logrus.GetLevel() != logrus.DebugLevel {

+		t.Fatalf("expected logrus debug level, got %v", logrus.GetLevel())

+	}

+}

new file mode 100644

@@ -0,0 +1,11 @@

+package main

+

+const daemonBinary = "dockerd"

+

+// DaemonProxy acts as a cli.Handler to proxy calls to the daemon binary

+type DaemonProxy struct{}

+

+// NewDaemonProxy returns a new handler

+func NewDaemonProxy() DaemonProxy {

+	return DaemonProxy{}

+}

new file mode 100644

@@ -0,0 +1,37 @@

+// +build !windows

+

+package main

+

+import (

+	"os"

+	"os/exec"

+	"syscall"

+)

+

+// CmdDaemon execs dockerd with the same flags

+// TODO: add a deprecation warning?

+func (p DaemonProxy) CmdDaemon(args ...string) error {

+	// Use os.Args[1:] so that "global" args are passed to dockerd

+	args = stripDaemonArg(os.Args[1:])

+

+	// TODO: check dirname args[0] first

+	binaryAbsPath, err := exec.LookPath(daemonBinary)

+	if err != nil {

+		return err

+	}

+

+	return syscall.Exec(

+		binaryAbsPath,

+		append([]string{daemonBinary}, args...),

+		os.Environ())

+}

+

+// stripDaemonArg removes the `daemon` argument from the list

+func stripDaemonArg(args []string) []string {

+	for i, arg := range args {

+		if arg == "daemon" {

+			return append(args[:i], args[i+1:]...)

+		}

+	}

+	return args

+}

new file mode 100644

@@ -0,0 +1,11 @@

+package main

+

+import (

+	"fmt"

+)

+

+// CmdDaemon reports on an error on windows, because there is no exec

+func (p DaemonProxy) CmdDaemon(args ...string) error {

+	return fmt.Errorf(

+		"`docker daemon` does not exist on windows. Please run `dockerd` directly")

+}

new file mode 100644

@@ -0,0 +1,18 @@

+package main

+

+import (

+	"strings"

+	"testing"

+)

+

+func TestCmdDaemon(t *testing.T) {

+	proxy := NewDaemonProxy()

+	err := proxy.CmdDaemon("--help")

+	if err == nil {

+		t.Fatal("Expected CmdDaemon to fail in Windows.")

+	}

+

+	if !strings.Contains(err.Error(), "Please run `dockerd`") {

+		t.Fatalf("Expected an error about running dockerd, got %s", err)

+	}

+}

new file mode 100644

@@ -0,0 +1,77 @@

+package main

+

+import (

+	"fmt"

+	"os"

+

+	"github.com/Sirupsen/logrus"

+	"github.com/docker/docker/api/client"

+	"github.com/docker/docker/cli"

+	"github.com/docker/docker/dockerversion"

+	flag "github.com/docker/docker/pkg/mflag"

+	"github.com/docker/docker/pkg/term"

+	"github.com/docker/docker/utils"

+)

+

+func main() {

+	// Set terminal emulation based on platform as required.

+	stdin, stdout, stderr := term.StdStreams()

+

+	logrus.SetOutput(stderr)

+

+	flag.Merge(flag.CommandLine, clientFlags.FlagSet, commonFlags.FlagSet)

+

+	flag.Usage = func() {

+		fmt.Fprint(stdout, "Usage: docker [OPTIONS] COMMAND [arg...]\n       docker [ --help | -v | --version ]\n\n")

+		fmt.Fprint(stdout, "A self-sufficient runtime for containers.\n\nOptions:\n")

+

+		flag.CommandLine.SetOutput(stdout)

+		flag.PrintDefaults()

+

+		help := "\nCommands:\n"

+

+		for _, cmd := range dockerCommands {

+			help += fmt.Sprintf("    %-10.10s%s\n", cmd.Name, cmd.Description)

+		}

+

+		help += "\nRun 'docker COMMAND --help' for more information on a command."

+		fmt.Fprintf(stdout, "%s\n", help)

+	}

+

+	flag.Parse()

+

+	if *flVersion {

+		showVersion()

+		return

+	}

+

+	if *flHelp {

+		// if global flag --help is present, regardless of what other options and commands there are,

+		// just print the usage.

+		flag.Usage()

+		return

+	}

+

+	clientCli := client.NewDockerCli(stdin, stdout, stderr, clientFlags)

+

+	c := cli.New(clientCli, NewDaemonProxy())

+	if err := c.Run(flag.Args()...); err != nil {

+		if sterr, ok := err.(cli.StatusError); ok {

+			if sterr.Status != "" {

+				fmt.Fprintln(stderr, sterr.Status)

+				os.Exit(1)

+			}

+			os.Exit(sterr.StatusCode)

+		}

+		fmt.Fprintln(stderr, err)

+		os.Exit(1)

+	}

+}

+

+func showVersion() {

+	if utils.ExperimentalBuild() {

+		fmt.Printf("Docker version %s, build %s, experimental\n", dockerversion.Version, dockerversion.GitCommit)

+	} else {

+		fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)

+	}

+}

new file mode 100644

@@ -0,0 +1,5 @@

+package main

+

+import (

+	_ "github.com/docker/docker/autogen/winresources/dockerd"

+)

new file mode 100644

@@ -0,0 +1,30 @@

+package main

+

+import (

+	"sort"

+

+	"github.com/docker/docker/cli"

+	flag "github.com/docker/docker/pkg/mflag"

+)

+

+var (

+	flHelp    = flag.Bool([]string{"h", "-help"}, false, "Print usage")

+	flVersion = flag.Bool([]string{"v", "-version"}, false, "Print version information and quit")

+)

+

+type byName []cli.Command

+

+func (a byName) Len() int           { return len(a) }

+func (a byName) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }

+func (a byName) Less(i, j int) bool { return a[i].Name < a[j].Name }

+

+var dockerCommands []cli.Command

+

+// TODO(tiborvass): do not show 'daemon' on client-only binaries

+

+func init() {

+	for _, cmd := range cli.DockerCommands {

+		dockerCommands = append(dockerCommands, cmd)

+	}

+	sort.Sort(byName(dockerCommands))

+}

new file mode 100644

@@ -0,0 +1,13 @@

+package main

+

+import (

+	"sort"

+	"testing"

+)

+

+// Tests if the subcommands of docker are sorted

+func TestDockerSubcommandsAreSorted(t *testing.T) {

+	if !sort.IsSorted(byName(dockerCommands)) {

+		t.Fatal("Docker subcommands are not in sorted order")

+	}

+}

new file mode 100644

@@ -0,0 +1,3 @@

+docker.go contains Docker's main function.

+

+This file provides first line CLI argument parsing and environment variable setting.

new file mode 100644

@@ -0,0 +1,424 @@

+package main

+

+import (

+	"crypto/tls"

+	"fmt"

+	"io"

+	"os"

+	"path/filepath"

+	"runtime"

+	"strings"

+	"time"

+

+	"github.com/Sirupsen/logrus"

+	"github.com/docker/distribution/uuid"

+	"github.com/docker/docker/api"

+	apiserver "github.com/docker/docker/api/server"

+	"github.com/docker/docker/api/server/middleware"

+	"github.com/docker/docker/api/server/router"

+	"github.com/docker/docker/api/server/router/build"

+	"github.com/docker/docker/api/server/router/container"

+	"github.com/docker/docker/api/server/router/image"

+	"github.com/docker/docker/api/server/router/network"

+	systemrouter "github.com/docker/docker/api/server/router/system"

+	"github.com/docker/docker/api/server/router/volume"

+	"github.com/docker/docker/builder/dockerfile"

+	"github.com/docker/docker/cli"

+	cliflags "github.com/docker/docker/cli/flags"

+	"github.com/docker/docker/cliconfig"

+	"github.com/docker/docker/daemon"

+	"github.com/docker/docker/daemon/logger"

+	"github.com/docker/docker/dockerversion"

+	"github.com/docker/docker/libcontainerd"

+	"github.com/docker/docker/opts"

+	"github.com/docker/docker/pkg/authorization"

+	"github.com/docker/docker/pkg/jsonlog"

+	"github.com/docker/docker/pkg/listeners"

+	flag "github.com/docker/docker/pkg/mflag"

+	"github.com/docker/docker/pkg/pidfile"

+	"github.com/docker/docker/pkg/signal"

+	"github.com/docker/docker/pkg/system"

+	"github.com/docker/docker/registry"

+	"github.com/docker/docker/runconfig"

+	"github.com/docker/docker/utils"

+	"github.com/docker/go-connections/tlsconfig"

+)

+

+const (

+	daemonConfigFileFlag = "-config-file"

+)

+

+// DaemonCli represents the daemon CLI.

+type DaemonCli struct {

+	*daemon.Config

+	commonFlags *cli.CommonFlags

+	configFile  *string

+}

+

+func presentInHelp(usage string) string { return usage }

+func absentFromHelp(string) string      { return "" }

+

+// NewDaemonCli returns a pre-configured daemon CLI

+func NewDaemonCli() *DaemonCli {

+	// TODO(tiborvass): remove InstallFlags?

+	daemonConfig := new(daemon.Config)

+	daemonConfig.LogConfig.Config = make(map[string]string)

+	daemonConfig.ClusterOpts = make(map[string]string)

+

+	if runtime.GOOS != "linux" {

+		daemonConfig.V2Only = true

+	}

+

+	daemonConfig.InstallFlags(flag.CommandLine, presentInHelp)

+	configFile := flag.CommandLine.String([]string{daemonConfigFileFlag}, defaultDaemonConfigFile, "Daemon configuration file")

+	flag.CommandLine.Require(flag.Exact, 0)

+

+	return &DaemonCli{

+		Config:      daemonConfig,

+		commonFlags: cliflags.InitCommonFlags(),

+		configFile:  configFile,

+	}

+}

+

+func migrateKey() (err error) {

+	// Migrate trust key if exists at ~/.docker/key.json and owned by current user

+	oldPath := filepath.Join(cliconfig.ConfigDir(), cliflags.DefaultTrustKeyFile)

+	newPath := filepath.Join(getDaemonConfDir(), cliflags.DefaultTrustKeyFile)

+	if _, statErr := os.Stat(newPath); os.IsNotExist(statErr) && currentUserIsOwner(oldPath) {

+		defer func() {

+			// Ensure old path is removed if no error occurred

+			if err == nil {

+				err = os.Remove(oldPath)

+			} else {

+				logrus.Warnf("Key migration failed, key file not removed at %s", oldPath)

+				os.Remove(newPath)

+			}

+		}()

+

+		if err := system.MkdirAll(getDaemonConfDir(), os.FileMode(0644)); err != nil {

+			return fmt.Errorf("Unable to create daemon configuration directory: %s", err)

+		}

+

+		newFile, err := os.OpenFile(newPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)

+		if err != nil {

+			return fmt.Errorf("error creating key file %q: %s", newPath, err)

+		}

+		defer newFile.Close()

+

+		oldFile, err := os.Open(oldPath)

+		if err != nil {

+			return fmt.Errorf("error opening key file %q: %s", oldPath, err)

+		}

+		defer oldFile.Close()

+

+		if _, err := io.Copy(newFile, oldFile); err != nil {

+			return fmt.Errorf("error copying key: %s", err)

+		}

+

+		logrus.Infof("Migrated key from %s to %s", oldPath, newPath)

+	}

+

+	return nil

+}

+

+func (cli *DaemonCli) start() {

+	// warn from uuid package when running the daemon

+	uuid.Loggerf = logrus.Warnf

+

+	flags := flag.CommandLine

+	cli.commonFlags.PostParse()

+

+	if cli.commonFlags.TrustKey == "" {

+		cli.commonFlags.TrustKey = filepath.Join(getDaemonConfDir(), cliflags.DefaultTrustKeyFile)

+	}

+	cliConfig, err := loadDaemonCliConfig(cli.Config, flags, cli.commonFlags, *cli.configFile)

+	if err != nil {

+		fmt.Fprint(os.Stderr, err)

+		os.Exit(1)

+	}

+	cli.Config = cliConfig

+

+	if cli.Config.Debug {

+		utils.EnableDebug()

+	}

+

+	if utils.ExperimentalBuild() {

+		logrus.Warn("Running experimental build")

+	}

+

+	logrus.SetFormatter(&logrus.TextFormatter{

+		TimestampFormat: jsonlog.RFC3339NanoFixed,

+		DisableColors:   cli.Config.RawLogs,

+	})

+

+	if err := setDefaultUmask(); err != nil {

+		logrus.Fatalf("Failed to set umask: %v", err)

+	}

+

+	if len(cli.LogConfig.Config) > 0 {

+		if err := logger.ValidateLogOpts(cli.LogConfig.Type, cli.LogConfig.Config); err != nil {

+			logrus.Fatalf("Failed to set log opts: %v", err)

+		}

+	}

+

+	var pfile *pidfile.PIDFile

+	if cli.Pidfile != "" {

+		pf, err := pidfile.New(cli.Pidfile)

+		if err != nil {

+			logrus.Fatalf("Error starting daemon: %v", err)

+		}

+		pfile = pf

+		defer func() {

+			if err := pfile.Remove(); err != nil {

+				logrus.Error(err)

+			}

+		}()

+	}

+

+	serverConfig := &apiserver.Config{

+		Logging:     true,

+		SocketGroup: cli.Config.SocketGroup,

+		Version:     dockerversion.Version,

+		EnableCors:  cli.Config.EnableCors,

+		CorsHeaders: cli.Config.CorsHeaders,

+	}

+

+	if cli.Config.TLS {

+		tlsOptions := tlsconfig.Options{

+			CAFile:   cli.Config.CommonTLSOptions.CAFile,

+			CertFile: cli.Config.CommonTLSOptions.CertFile,

+			KeyFile:  cli.Config.CommonTLSOptions.KeyFile,

+		}

+

+		if cli.Config.TLSVerify {

+			// server requires and verifies client's certificate

+			tlsOptions.ClientAuth = tls.RequireAndVerifyClientCert

+		}

+		tlsConfig, err := tlsconfig.Server(tlsOptions)

+		if err != nil {

+			logrus.Fatal(err)

+		}

+		serverConfig.TLSConfig = tlsConfig

+	}

+

+	if len(cli.Config.Hosts) == 0 {

+		cli.Config.Hosts = make([]string, 1)

+	}

+

+	api := apiserver.New(serverConfig)

+

+	for i := 0; i < len(cli.Config.Hosts); i++ {

+		var err error

+		if cli.Config.Hosts[i], err = opts.ParseHost(cli.Config.TLS, cli.Config.Hosts[i]); err != nil {

+			logrus.Fatalf("error parsing -H %s : %v", cli.Config.Hosts[i], err)

+		}

+

+		protoAddr := cli.Config.Hosts[i]

+		protoAddrParts := strings.SplitN(protoAddr, "://", 2)

+		if len(protoAddrParts) != 2 {

+			logrus.Fatalf("bad format %s, expected PROTO://ADDR", protoAddr)

+		}

+

+		proto := protoAddrParts[0]

+		addr := protoAddrParts[1]

+

+		// It's a bad idea to bind to TCP without tlsverify.

+		if proto == "tcp" && (serverConfig.TLSConfig == nil || serverConfig.TLSConfig.ClientAuth != tls.RequireAndVerifyClientCert) {

+			logrus.Warn("[!] DON'T BIND ON ANY IP ADDRESS WITHOUT setting -tlsverify IF YOU DON'T KNOW WHAT YOU'RE DOING [!]")

+		}

+		l, err := listeners.Init(proto, addr, serverConfig.SocketGroup, serverConfig.TLSConfig)

+		if err != nil {

+			logrus.Fatal(err)

+		}

+		// If we're binding to a TCP port, make sure that a container doesn't try to use it.

+		if proto == "tcp" {

+			if err := allocateDaemonPort(addr); err != nil {

+				logrus.Fatal(err)

+			}

+		}

+		logrus.Debugf("Listener created for HTTP on %s (%s)", protoAddrParts[0], protoAddrParts[1])

+		api.Accept(protoAddrParts[1], l...)

+	}

+

+	if err := migrateKey(); err != nil {

+		logrus.Fatal(err)

+	}

+	cli.TrustKeyPath = cli.commonFlags.TrustKey

+

+	registryService := registry.NewService(cli.Config.ServiceOptions)

+	containerdRemote, err := libcontainerd.New(cli.getLibcontainerdRoot(), cli.getPlatformRemoteOptions()...)

+	if err != nil {

+		logrus.Fatal(err)

+	}

+

+	d, err := daemon.NewDaemon(cli.Config, registryService, containerdRemote)

+	if err != nil {