1berry/docker-compose
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sanitize service name so they can be used as bake targets

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2025-06-10 08:09:07 +02:00 committed by Guillaume Lours
parent ea48480d80
commit ebd7b761f2
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/compose/build_bake.go
View File

@ -144,8 +144,21 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
privileged bool privileged bool
read []string read []string
expectedImages = make(map[string]string, len(serviceToBeBuild)) // service name -> expected image expectedImages = make(map[string]string, len(serviceToBeBuild)) // service name -> expected image
targets = make(map[string]string, len(serviceToBeBuild)) // service name -> build target
) )
// produce a unique ID for service used as bake target
for serviceName := range serviceToBeBuild {
t := strings.ReplaceAll(serviceName, ".", "_")
for {
if _, ok := targets[serviceName]; !ok {
targets[serviceName] = t
break
}
t += "_"
}
}
for serviceName, service := range serviceToBeBuild { for serviceName, service := range serviceToBeBuild {
if service.Build == nil { if service.Build == nil {
continue continue
@ -192,9 +205,10 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
} }
} }
cfg.Targets[serviceName] = bakeTarget{ target := targets[serviceName]
cfg.Targets[target] = bakeTarget{
Context: build.Context, Context: build.Context,
Contexts: additionalContexts(build.AdditionalContexts), Contexts: additionalContexts(build.AdditionalContexts, targets),
Dockerfile: dockerFilePath(build.Context, build.Dockerfile), Dockerfile: dockerFilePath(build.Context, build.Dockerfile),
DockerfileInline: strings.ReplaceAll(build.DockerfileInline, "${", "$${"), DockerfileInline: strings.ReplaceAll(build.DockerfileInline, "${", "$${"),
Args: args, Args: args,
@ -216,7 +230,7 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
Outputs: outputs, Outputs: outputs,
Call: call, Call: call,
} }
group.Targets = append(group.Targets, serviceName) group.Targets = append(group.Targets, target)
} }
cfg.Groups["default"] = group cfg.Groups["default"] = group
@ -340,7 +354,7 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
cw := progress.ContextWriter(ctx) cw := progress.ContextWriter(ctx)
results := map[string]string{} results := map[string]string{}
for service, name := range expectedImages { for service, name := range expectedImages {
built, ok := md[service] // bake target == service name built, ok := md[targets[service]]
if !ok { if !ok {
return nil, fmt.Errorf("build result not found in Bake metadata for service %s", service) return nil, fmt.Errorf("build result not found in Bake metadata for service %s", service)
} }
@ -350,11 +364,11 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
return results, nil return results, nil
} }
func additionalContexts(contexts types.Mapping) map[string]string { func additionalContexts(contexts types.Mapping, targets map[string]string) map[string]string {
ac := map[string]string{} ac := map[string]string{}
for k, v := range contexts { for k, v := range contexts {
if target, found := strings.CutPrefix(v, types.ServicePrefix); found { if target, found := strings.CutPrefix(v, types.ServicePrefix); found {
v = "target:" + target v = "target:" + targets[target]
} }
ac[k] = v ac[k] = v
} }