Merge pull request moby#48519 from thaJeztah/cleanup_daemon_start_step2

cmd/dockerd: runDaemon: extract platform-agnostic code

cmd/dockerd/docker.go

@@ -35,7 +35,18 @@ func newDaemonCommand() (*cobra.Command, error) {
 		Args:          NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.flags = cmd.Flags()
-			return runDaemon(cmd.Context(), opts)
+
+			cli, err := newDaemonCLI(opts)
+			if err != nil {
+				return err
+			}
+			if opts.Validate {
+				// If config wasn't OK we wouldn't have made it this far.
+				_, _ = fmt.Fprintln(os.Stderr, "configuration OK")
+				return nil
+			}
+
+			return runDaemon(cmd.Context(), cli)
 		},
 		DisableFlagsInUseLine: true,
 		Version:               fmt.Sprintf("%s, build %s", dockerversion.Version, dockerversion.GitCommit),

cmd/dockerd/docker_unix.go

@@ -4,23 +4,12 @@ package main
 
 import (
 	"context"
-	"fmt"
 	"io"
-	"os"
 
 	"github.com/containerd/log"
 )
 
-func runDaemon(ctx context.Context, opts *daemonOptions) error {
-	cli, err := newDaemonCLI(opts)
-	if err != nil {
-		return err
-	}
-	if opts.Validate {
-		// If config wasn't OK we wouldn't have made it this far.
-		_, _ = fmt.Fprintln(os.Stderr, "configuration OK")
-		return nil
-	}
+func runDaemon(ctx context.Context, cli *daemonCLI) error {
 	return cli.start(ctx)
 }
 

cmd/dockerd/docker_windows.go

@@ -2,25 +2,13 @@ package main
 
 import (
 	"context"
-	"fmt"
 	"io"
-	"os"
 
 	"github.com/Microsoft/go-winio/pkg/etwlogrus"
 	"github.com/containerd/log"
 )
 
-func runDaemon(ctx context.Context, opts *daemonOptions) error {
-	cli, err := newDaemonCLI(opts)
-	if err != nil {
-		return err
-	}
-	if opts.Validate {
-		// If config wasn't OK we wouldn't have made it this far.
-		_, _ = fmt.Fprintln(os.Stderr, "configuration OK")
-		return nil
-	}
-
+func runDaemon(ctx context.Context, cli *daemonCLI) error {
 	// On Windows, this may be launching as a service or with an option to
 	// register the service.
 	stop, runAsService, err := initService(cli)