InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48953 from thaJeztah/carry_buildkit_init_timeout

Browse Source 
Remove buildkit init timeout
This commit is contained in:
Sebastiaan van Stijn
2024-11-27 10:23:24 +01:00
committed by GitHub
parent d3cc051f50 b7f43c3729
commit f052dbb54b
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/dockerd/daemon.go
View File

@@ -294,16 +294,13 @@ func (cli *daemonCLI) start(ctx context.Context) (err error) {
log.G(ctx).Info("Daemon has completed initialization")
routerCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
// Get a the current daemon config, because the daemon sets up config
// during initialization. We cannot user the cli.Config for that reason,
// as that only holds the config that was set by the user.
//
// FIXME(thaJeztah): better separate runtime and config data?
daemonCfg := d.Config()
routerOpts, err := newRouterOptions(routerCtx, &daemonCfg, d, c)
routerOpts, err := newRouterOptions(ctx, &daemonCfg, d, c)
if err != nil {
return err
}