Merge pull request #50010 from dmcgowan/dockerd-command-daemon

Split dockerd main command to package under daemon

cmd/dockerd/builtins/builtins.go

@@ -0,0 +1 @@
+package builtins

cmd/dockerd/builtins/genwinres_windows.go

@@ -1,5 +1,5 @@
-//go:generate go-winres make --arch=386,amd64,arm,arm64 --in=../../cli/winresources/dockerd/winres.json --out=../../cli/winresources/dockerd/resource
+//go:generate go-winres make --arch=386,amd64,arm,arm64 --in=../../../cli/winresources/dockerd/winres.json --out=../../../cli/winresources/dockerd/resource
 
-package main
+package builtins
 
 import _ "github.com/docker/docker/cli/winresources/dockerd"

cmd/dockerd/main.go

@@ -0,0 +1,43 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/moby/sys/reexec"
+	"github.com/moby/term"
+
+	"github.com/docker/docker/daemon/command"
+
+	_ "github.com/docker/docker/cmd/dockerd/builtins"
+)
+
+func main() {
+	if reexec.Init() {
+		return
+	}
+	ctx := context.Background()
+
+	// Ignore SIGPIPE events. These are generated by systemd when journald is restarted while
+	// the docker daemon is not restarted and also running under systemd.
+	// Fixes https://github.com/docker/docker/issues/19728
+	signal.Ignore(syscall.SIGPIPE)
+
+	// Set terminal emulation based on platform as required.
+	_, stdout, stderr := term.StdStreams()
+	onError := func(err error) {
+		fmt.Fprintf(stderr, "%s\n", err)
+		os.Exit(1)
+	}
+
+	r, err := command.NewDaemonRunner(stdout, stderr)
+	if err != nil {
+		onError(err)
+	}
+	if err := r.Run(ctx); err != nil {
+		onError(err)
+	}
+}

daemon/command/cobra.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"fmt"

daemon/command/config.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"runtime"

daemon/command/config_unix.go

@@ -1,6 +1,6 @@
-//go:build linux || freebsd
+//go:build unix
 
-package main
+package command
 
 import (
 	"net"

daemon/command/config_unix_test.go

@@ -1,6 +1,6 @@
-//go:build linux || freebsd
+//go:build unix
 
-package main
+package command
 
 import (
 	"testing"

daemon/command/config_windows.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"github.com/docker/docker/daemon/config"

daemon/command/daemon.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"
@@ -39,10 +39,10 @@ import (
 	buildkit "github.com/docker/docker/builder/builder-next"
 	"github.com/docker/docker/builder/builder-next/exporter"
 	"github.com/docker/docker/builder/dockerfile"
-	"github.com/docker/docker/cmd/dockerd/debug"
-	"github.com/docker/docker/cmd/dockerd/trap"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/daemon/cluster"
+	"github.com/docker/docker/daemon/command/debug"
+	"github.com/docker/docker/daemon/command/trap"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/listeners"
 	"github.com/docker/docker/dockerversion"

daemon/command/daemon_freebsd.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import "github.com/docker/docker/daemon/config"
 

daemon/command/daemon_linux.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	cdcgroups "github.com/containerd/cgroups/v3"

daemon/command/daemon_linux_test.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"bytes"

daemon/command/daemon_test.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"runtime"

daemon/command/daemon_unix.go

@@ -1,6 +1,6 @@
-//go:build !windows
+//go:build unix
 
-package main
+package command
 
 import (
 	"context"

daemon/command/daemon_unix_test.go

@@ -1,6 +1,6 @@
-//go:build !windows
+//go:build unix
 
-package main
+package command
 
 import (
 	"testing"

daemon/command/daemon_windows.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"

daemon/command/docker.go

@@ -1,25 +1,21 @@
-package main
+package command
 
 import (
 	"context"
 	"fmt"
-	"os"
-	"os/signal"
-	"syscall"
+	"io"
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/pkg/rootless"
 	"github.com/moby/buildkit/util/apicaps"
-	"github.com/moby/sys/reexec"
-	"github.com/moby/term"
 	"github.com/spf13/cobra"
 )
 
 var honorXDG bool
 
-func newDaemonCommand() (*cobra.Command, error) {
+func newDaemonCommand(stderr io.Writer) (*cobra.Command, error) {
 	// FIXME(thaJeztah): config.New also looks up default binary-path, but this code is also executed when running "--version".
 	cfg, err := config.New()
 	if err != nil {
@@ -42,7 +38,7 @@ func newDaemonCommand() (*cobra.Command, error) {
 			}
 			if opts.Validate {
 				// If config wasn't OK we wouldn't have made it this far.
-				_, _ = fmt.Fprintln(os.Stderr, "configuration OK")
+				_, _ = fmt.Fprintln(stderr, "configuration OK")
 				return nil
 			}
 
@@ -100,39 +96,36 @@ func init() {
 	honorXDG = rootless.RunningWithRootlessKit()
 }
 
-func main() {
-	if reexec.Init() {
-		return
-	}
-	ctx := context.Background()
-
-	// Ignore SIGPIPE events. These are generated by systemd when journald is restarted while
-	// the docker daemon is not restarted and also running under systemd.
-	// Fixes https://github.com/docker/docker/issues/19728
-	signal.Ignore(syscall.SIGPIPE)
-
-	// Set terminal emulation based on platform as required.
-	_, stdout, stderr := term.StdStreams()
-	onError := func(err error) {
-		fmt.Fprintf(stderr, "%s\n", err)
-		os.Exit(1)
+// Runner is used to run the daemon command
+type Runner interface {
+	Run(context.Context) error
 }
 
-	// initial log formatting; this setting is updated after the daemon configuration is loaded.
+type daemonRunner struct {
+	*cobra.Command
+}
+
+func (d daemonRunner) Run(ctx context.Context) error {
+	configureGRPCLog(ctx)
+
+	return d.ExecuteContext(ctx)
+}
+
+// NewDaemonRunner creates a new daemon runner with the given
+// stdout and stderr writers.
+func NewDaemonRunner(stdout, stderr io.Writer) (Runner, error) {
 	err := log.SetFormat(log.TextFormat)
 	if err != nil {
-		onError(err)
+		return nil, err
 	}
 
 	initLogging(stdout, stderr)
-	configureGRPCLog()
 
-	cmd, err := newDaemonCommand()
+	cmd, err := newDaemonCommand(stderr)
 	if err != nil {
-		onError(err)
+		return nil, err
 	}
 	cmd.SetOut(stdout)
-	if err := cmd.ExecuteContext(ctx); err != nil {
-		onError(err)
-	}
+
+	return daemonRunner{cmd}, nil
 }

daemon/command/docker_unix.go

@@ -1,6 +1,6 @@
-//go:build !windows
+//go:build unix
 
-package main
+package command
 
 import (
 	"context"

daemon/command/docker_windows.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"

daemon/command/error.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"fmt"

daemon/command/grpclog.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"
@@ -13,7 +13,7 @@ import (
 // info => trace
 // warn => debug
 // error => warn
-func configureGRPCLog() {
-	l := log.G(context.TODO()).WithField("library", "grpc")
+func configureGRPCLog(ctx context.Context) {
+	l := log.G(ctx).WithField("library", "grpc")
 	grpclog.SetLoggerV2(grpclog.NewLoggerV2(l.WriterLevel(log.TraceLevel), l.WriterLevel(log.DebugLevel), l.WriterLevel(log.WarnLevel)))
 }

daemon/command/main_linux_test.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"testing"

daemon/command/metrics.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"context"

daemon/command/options.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"fmt"

daemon/command/options_test.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"path/filepath"

daemon/command/required.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"strings"

daemon/command/service_unsupported.go

@@ -1,6 +1,6 @@
 //go:build !windows
 
-package main
+package command
 
 import (
 	"github.com/spf13/pflag"

daemon/command/service_windows.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"bytes"

daemon/command/trap/testfiles/main.go

@@ -5,7 +5,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/docker/docker/cmd/dockerd/trap"
+	"github.com/docker/docker/daemon/command/trap"
 )
 
 func main() {

daemon/info.go

@@ -17,7 +17,7 @@ import (
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/system"
-	"github.com/docker/docker/cmd/dockerd/debug"
+	"github.com/docker/docker/daemon/command/debug"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/internal/filedescriptors"
 	"github.com/docker/docker/daemon/logger"