mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
85572cac14
The registry package contained code to automatically set the CertsDir() path,
based on wether or not the daemon was running in rootlessmode. In doing so,
it made use of the `pkg/rootless.RunningWithRootlessKit()` utility.
A recent change in de6732a403 added additional
functionality in the `pkg/rootless` package, introducing a dependency on
`github.com/rootless-containers/rootlesskit`. Unfortunately, the extra
dependency also made its way into the docker cli, which also uses the
registry package.
This patch introduces a new `SetCertsDir()` function, which allows
the default certs-directory to be overridden, and updates the daemon
to configure this location during startup.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
101 lines
2.7 KiB
Go
101 lines
2.7 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/docker/docker/cli"
|
|
"github.com/docker/docker/daemon/config"
|
|
"github.com/docker/docker/dockerversion"
|
|
"github.com/docker/docker/pkg/jsonmessage"
|
|
"github.com/docker/docker/pkg/reexec"
|
|
"github.com/docker/docker/rootless"
|
|
"github.com/moby/buildkit/util/apicaps"
|
|
"github.com/moby/term"
|
|
"github.com/sirupsen/logrus"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
var (
|
|
honorXDG bool
|
|
)
|
|
|
|
func newDaemonCommand() (*cobra.Command, error) {
|
|
opts := newDaemonOptions(config.New())
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "dockerd [OPTIONS]",
|
|
Short: "A self-sufficient runtime for containers.",
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
Args: cli.NoArgs,
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
opts.flags = cmd.Flags()
|
|
return runDaemon(opts)
|
|
},
|
|
DisableFlagsInUseLine: true,
|
|
Version: fmt.Sprintf("%s, build %s", dockerversion.Version, dockerversion.GitCommit),
|
|
}
|
|
cli.SetupRootCommand(cmd)
|
|
|
|
flags := cmd.Flags()
|
|
flags.BoolP("version", "v", false, "Print version information and quit")
|
|
defaultDaemonConfigFile, err := getDefaultDaemonConfigFile()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
flags.StringVar(&opts.configFile, "config-file", defaultDaemonConfigFile, "Daemon configuration file")
|
|
configureCertsDir()
|
|
opts.InstallFlags(flags)
|
|
if err := installConfigFlags(opts.daemonConfig, flags); err != nil {
|
|
return nil, err
|
|
}
|
|
installServiceFlags(flags)
|
|
|
|
return cmd, nil
|
|
}
|
|
|
|
func init() {
|
|
if dockerversion.ProductName != "" {
|
|
apicaps.ExportedProduct = dockerversion.ProductName
|
|
}
|
|
// When running with RootlessKit, $XDG_RUNTIME_DIR, $XDG_DATA_HOME, and $XDG_CONFIG_HOME needs to be
|
|
// honored as the default dirs, because we are unlikely to have permissions to access the system-wide
|
|
// directories.
|
|
//
|
|
// Note that even running with --rootless, when not running with RootlessKit, honorXDG needs to be kept false,
|
|
// because the system-wide directories in the current mount namespace are expected to be accessible.
|
|
// ("rootful" dockerd in rootless dockerd, #38702)
|
|
honorXDG = rootless.RunningWithRootlessKit()
|
|
}
|
|
|
|
func main() {
|
|
if reexec.Init() {
|
|
return
|
|
}
|
|
|
|
// initial log formatting; this setting is updated after the daemon configuration is loaded.
|
|
logrus.SetFormatter(&logrus.TextFormatter{
|
|
TimestampFormat: jsonmessage.RFC3339NanoFixed,
|
|
FullTimestamp: true,
|
|
})
|
|
|
|
// Set terminal emulation based on platform as required.
|
|
_, stdout, stderr := term.StdStreams()
|
|
|
|
initLogging(stdout, stderr)
|
|
|
|
onError := func(err error) {
|
|
fmt.Fprintf(stderr, "%s\n", err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
cmd, err := newDaemonCommand()
|
|
if err != nil {
|
|
onError(err)
|
|
}
|
|
cmd.SetOut(stdout)
|
|
if err := cmd.Execute(); err != nil {
|
|
onError(err)
|
|
}
|
|
}
|