Skip to content

Create api interface to define build usage backend#49924

Merged
vvoland merged 1 commit intomoby:masterfrom
dmcgowan:api-system-build-backend
May 13, 2025
Merged

Create api interface to define build usage backend#49924
vvoland merged 1 commit intomoby:masterfrom
dmcgowan:api-system-build-backend

Conversation

@dmcgowan
Copy link
Member

@dmcgowan dmcgowan commented May 5, 2025

Avoid importing buildkit builder into api package when only a single backend function is needed.

Related to #49873

@dmcgowan
Create api interface to define build usage backend
92e497b 
Avoid importing buildkit builder into api package when only a single
backend function is needed.

Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan dmcgowan mentioned this pull request May 5, 2025
Closed
17 tasks
@thompson-shaun thompson-shaun added this to the 29.0.0 milestone May 5, 2025
@thaJeztah
Copy link
Member

thaJeztah commented May 6, 2025

As a follow-up, we could consideradd this method (as a wrapper) to the backend/builder;

moby/api/server/backend/build/backend.go

Lines 32 to 38 in 453c165

// Backend provides build functionality to the API router
type Backend struct {
builder Builder
imageComponent ImageComponent
buildkit *buildkit.Builder
eventsService *daemonevents.Events
}

Then we wouldn't have to pass two separate fields in builder options;

moby/cmd/dockerd/daemon.go

Lines 434 to 449 in 453c165

bb, err := buildbackend.NewBackend(d.ImageService(), manager, bk, d.EventsService)
if err != nil {
return builderOptions{}, closeFn, errors.Wrap(err, "failed to create builder backend")
}
log.G(ctx).Info("Completed buildkit initialization")
closeFn = func() {
if err := bk.Close(); err != nil {
log.G(ctx).WithError(err).Error("Failed to close buildkit")
}
}
return builderOptions{
backend: bb,
buildkit: bk,

moby/cmd/dockerd/daemon.go

Line 718 in 453c165

systemrouter.NewRouter(opts.daemon, opts.cluster, opts.builder.buildkit, opts.daemon.Features),

moby/cmd/dockerd/daemon.go

Line 730 in 453c165

routers = append(routers, grpcrouter.NewRouter(opts.builder.backend))

@thaJeztah thaJeztah added area/api API area/builder Build status/2-code-review kind/refactor PR's that refactor, or clean-up code labels May 6, 2025
thaJeztah
thaJeztah approved these changes May 6, 2025
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@vvoland vvoland merged commit d42d79d into moby:master May 13, 2025
155 of 156 checks passed
@vvoland vvoland modified the milestones: 29.0.0, 28.2.0 May 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@vvoland vvoland vvoland approved these changes

Assignees

@vvoland vvoland

Labels

area/api API area/builder Build go-modules kind/refactor PR's that refactor, or clean-up code status/2-code-review

Projects

None yet

Milestone

28.2.0

Development

Successfully merging this pull request may close these issues.

4 participants

@dmcgowan @thaJeztah @vvoland @thompson-shaun