Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vendor: github.com/moby/buildkit v0.12.3-dev #46644

Merged
merged 1 commit into from
Oct 15, 2023
Merged

vendor: github.com/moby/buildkit v0.12.3-dev #46644

merged 1 commit into from
Oct 15, 2023

Conversation

thaJeztah
Copy link
Member

update buildkit to the latest code in the v0.12 branch:

full diff: moby/buildkit@f94ed7c...6560bb9

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah thaJeztah added this to the 25.0.0 milestone Oct 13, 2023
@thaJeztah thaJeztah requested a review from neersighted October 13, 2023 20:35
neersighted
neersighted reviewed Oct 13, 2023
View reviewed changes
Copy link
Member

@neersighted neersighted left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fairly sure that (pending CI) changes will be needed in how we set up the BuildKit controller due to moby/buildkit@c297384.

Locations of interest in moby/moby:

moby/builder/builder-next/controller.go

Lines 134 to 157 in 80a9fc6

return control.NewController(control.Opt{
SessionManager: opt.SessionManager,
WorkerController: wc,
Frontends: frontends,
CacheManager: solver.NewCacheManager(ctx, "local", cacheStorage, worker.NewCacheResultStorage(wc)),
ResolveCacheImporterFuncs: map[string]remotecache.ResolveCacheImporterFunc{
"gha": gha.ResolveCacheImporterFunc(),
"local": localremotecache.ResolveCacheImporterFunc(opt.SessionManager),
"registry": registryremotecache.ResolveCacheImporterFunc(opt.SessionManager, wo.ContentStore, opt.RegistryHosts),
},
ResolveCacheExporterFuncs: map[string]remotecache.ResolveCacheExporterFunc{
"gha": gha.ResolveCacheExporterFunc(),
"inline": inlineremotecache.ResolveCacheExporterFunc(),
"local": localremotecache.ResolveCacheExporterFunc(opt.SessionManager),
"registry": registryremotecache.ResolveCacheExporterFunc(opt.SessionManager, opt.RegistryHosts),
},
Entitlements: getEntitlements(opt.BuilderConfig),
HistoryDB: historyDB,
HistoryConfig: historyConf,
LeaseManager: wo.LeaseManager,
ContentStore: wo.ContentStore,
TraceCollector: getTraceExporter(ctx),
})
}

moby/builder/builder-next/controller.go

Lines 355 to 374 in 80a9fc6

return control.NewController(control.Opt{
SessionManager: opt.SessionManager,
WorkerController: wc,
Frontends: frontends,
CacheManager: solver.NewCacheManager(ctx, "local", cacheStorage, worker.NewCacheResultStorage(wc)),
ResolveCacheImporterFuncs: map[string]remotecache.ResolveCacheImporterFunc{
"registry": localinlinecache.ResolveCacheImporterFunc(opt.SessionManager, opt.RegistryHosts, store, dist.ReferenceStore, dist.ImageStore),
"local": localremotecache.ResolveCacheImporterFunc(opt.SessionManager),
},
ResolveCacheExporterFuncs: map[string]remotecache.ResolveCacheExporterFunc{
"inline": inlineremotecache.ResolveCacheExporterFunc(),
},
Entitlements: getEntitlements(opt.BuilderConfig),
LeaseManager: lm,
ContentStore: store,
HistoryDB: historyDB,
HistoryConfig: historyConf,
TraceCollector: getTraceExporter(ctx),
})
}

@thaJeztah
Copy link
Member Author

CI looks happy, but perhaps @tonistiigi knows if changes are needed?

@thaJeztah @tonistiigi
vendor: github.com/moby/buildkit v0.12.3-dev
919fe72 
update buildkit to the latest code in the v0.12 branch:

full diff: moby/buildkit@f94ed7c...6560bb9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi tonistiigi force-pushed the bump_buildkit_v0.12.3 branch from 558ec75 to 919fe72 Compare October 14, 2023 00:06
@tonistiigi tonistiigi self-requested a review as a code owner October 14, 2023 00:06
@AkihiroSuda AkihiroSuda merged commit 670bc0a into moby:master Oct 15, 2023
102 checks passed
@thaJeztah thaJeztah deleted the bump_buildkit_v0.12.3 branch October 16, 2023 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@neersighted neersighted neersighted approved these changes

@tonistiigi tonistiigi Awaiting requested review from tonistiigi tonistiigi is a code owner

@crazy-max crazy-max Awaiting requested review from crazy-max

@vvoland vvoland Awaiting requested review from vvoland

Assignees
No one assigned
Labels
area/builder/buildkit Issues affecting buildkit area/builder status/2-code-review
Projects
None yet
Milestone
25.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @neersighted @AkihiroSuda