Skip to content

fix collect image digests for service images built by bake #12784

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

Merged
glours merged 1 commit into from
May 5, 2025
Merged

fix collect image digests for service images built by bake #12784

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions pkg/compose/build_bake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ type bakeMetadata map[string]buildStatus

type buildStatus struct {
Digest string `json:"containerimage.digest"`
Image string `json:"image.name"`
}

func (s *composeService) doBuildBake(ctx context.Context, project *types.Project, serviceToBeBuild types.Services, options api.BuildOptions) (map[string]string, error) { //nolint:gocyclo
Expand All @@ -142,9 +143,12 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
Groups: map[string]bakeGroup{},
Targets: map[string]bakeTarget{},
}
var group bakeGroup
var privileged bool
var read []string
var (
group bakeGroup
privileged bool
read []string
expectedImages = make(map[string]string, len(serviceToBeBuild)) // service name -> expected image
)

for serviceName, service := range serviceToBeBuild {
if service.Build == nil {
Expand All @@ -161,6 +165,7 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
}

image := api.GetImageNameOrDefault(service, project.Name)
expectedImages[serviceName] = image

entitlements := build.Entitlements
if slices.Contains(build.Entitlements, "security.insecure") {
Expand Down Expand Up @@ -324,8 +329,12 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project

cw := progress.ContextWriter(ctx)
results := map[string]string{}
for name, m := range md {
results[name] = m.Digest
for service, name := range expectedImages {
built, ok := md[service] // bake target == service name
if !ok {
return nil, fmt.Errorf("build result not found in Bake metadata for service %s", service)
}
results[name] = built.Digest
cw.Event(progress.BuiltEvent(name))
}
return results, nil
Expand Down