mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
568f86eb18
Passing RepositoryInfo to ResolveAuthConfig, pullRepository, and pushRepository Moving --registry-mirror configuration to registry config Created resolve_repository job Repo names with 'index.docker.io' or 'docker.io' are now synonymous with omitting an index name. Adding test for RepositoryInfo Adding tests for opts.StringSetOpts and registry.ValidateMirror Fixing search term use of repoInfo Adding integration tests for registry mirror configuration Normalizing LookupImage image name to match LocalName parsing rules Normalizing repository LocalName to avoid multiple references to an official image Removing errorOut use in tests Removing TODO comment gofmt changes golint comments cleanup. renaming RegistryOptions => registry.Options, and RegistryServiceConfig => registry.ServiceConfig Splitting out builtins.Registry and registry.NewService calls Stray whitespace cleanup Moving integration tests for Mirrors and InsecureRegistries into TestNewIndexInfo unit test Factoring out ValidateRepositoryName from NewRepositoryInfo Removing unused IndexServerURL Allowing json marshaling of ServiceConfig. Exposing ServiceConfig in /info Switching to CamelCase for json marshaling PR cleanup; removing 'Is' prefix from boolean members. Removing unneeded json tags. Removing non-cleanup related fix for 'localhost:[port]' in splitReposName Merge fixes for gh9735 Fixing integration test Reapplying #9754 Adding comment on config.IndexConfigs use from isSecureIndex Remove unused error return value from isSecureIndex Signed-off-by: Don Kjer <don.kjer@gmail.com> Adding back comment in isSecureIndex Signed-off-by: Don Kjer <don.kjer@gmail.com>
96 lines
2.2 KiB
Go
96 lines
2.2 KiB
Go
// +build daemon
|
|
|
|
package main
|
|
|
|
import (
|
|
log "github.com/Sirupsen/logrus"
|
|
"github.com/docker/docker/builder"
|
|
"github.com/docker/docker/builtins"
|
|
"github.com/docker/docker/daemon"
|
|
_ "github.com/docker/docker/daemon/execdriver/lxc"
|
|
_ "github.com/docker/docker/daemon/execdriver/native"
|
|
"github.com/docker/docker/dockerversion"
|
|
"github.com/docker/docker/engine"
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
"github.com/docker/docker/pkg/signal"
|
|
"github.com/docker/docker/registry"
|
|
)
|
|
|
|
const CanDaemon = true
|
|
|
|
var (
|
|
daemonCfg = &daemon.Config{}
|
|
registryCfg = ®istry.Options{}
|
|
)
|
|
|
|
func init() {
|
|
daemonCfg.InstallFlags()
|
|
registryCfg.InstallFlags()
|
|
}
|
|
|
|
func mainDaemon() {
|
|
if flag.NArg() != 0 {
|
|
flag.Usage()
|
|
return
|
|
}
|
|
eng := engine.New()
|
|
signal.Trap(eng.Shutdown)
|
|
|
|
daemonCfg.TrustKeyPath = *flTrustKey
|
|
|
|
// Load builtins
|
|
if err := builtins.Register(eng); err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
|
|
// load registry service
|
|
if err := registry.NewService(registryCfg).Install(eng); err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
|
|
// load the daemon in the background so we can immediately start
|
|
// the http api so that connections don't fail while the daemon
|
|
// is booting
|
|
go func() {
|
|
d, err := daemon.NewDaemon(daemonCfg, eng)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
log.Infof("docker daemon: %s %s; execdriver: %s; graphdriver: %s",
|
|
dockerversion.VERSION,
|
|
dockerversion.GITCOMMIT,
|
|
d.ExecutionDriver().Name(),
|
|
d.GraphDriver().String(),
|
|
)
|
|
|
|
if err := d.Install(eng); err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
|
|
b := &builder.BuilderJob{eng, d}
|
|
b.Install()
|
|
|
|
// after the daemon is done setting up we can tell the api to start
|
|
// accepting connections
|
|
if err := eng.Job("acceptconnections").Run(); err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}()
|
|
|
|
// Serve api
|
|
job := eng.Job("serveapi", flHosts...)
|
|
job.SetenvBool("Logging", true)
|
|
job.SetenvBool("EnableCors", *flEnableCors)
|
|
job.Setenv("Version", dockerversion.VERSION)
|
|
job.Setenv("SocketGroup", *flSocketGroup)
|
|
|
|
job.SetenvBool("Tls", *flTls)
|
|
job.SetenvBool("TlsVerify", *flTlsVerify)
|
|
job.Setenv("TlsCa", *flCa)
|
|
job.Setenv("TlsCert", *flCert)
|
|
job.Setenv("TlsKey", *flKey)
|
|
job.SetenvBool("BufferRequests", true)
|
|
if err := job.Run(); err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|