run TestBuildImageDependencies in backward compatibility mode

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

cmd/compose/build.go

@@ -68,17 +68,16 @@ func (opts buildOptions) toAPIBuildOptions(services []string) (api.BuildOptions,
 		uiMode = "rawjson"
 	}
 	return api.BuildOptions{
-		Pull:          opts.pull,
-		Push:          opts.push,
-		Progress:      uiMode,
-		Args:          types.NewMappingWithEquals(opts.args),
-		NoCache:       opts.noCache,
-		Quiet:         opts.quiet,
-		Services:      services,
-		Deps:          opts.deps,
-		SSHs:          SSHKeys,
-		Builder:       builderName,
-		Compatibility: opts.Compatibility,
+		Pull:     opts.pull,
+		Push:     opts.push,
+		Progress: uiMode,
+		Args:     types.NewMappingWithEquals(opts.args),
+		NoCache:  opts.noCache,
+		Quiet:    opts.quiet,
+		Services: services,
+		Deps:     opts.deps,
+		SSHs:     SSHKeys,
+		Builder:  builderName,
 	}, nil
 }
 

pkg/api/api.go

@@ -155,8 +155,6 @@ type BuildOptions struct {
 	Memory int64
 	// Builder name passed in the command line
 	Builder string
-	// Compatibility let compose run with best backward compatibility
-	Compatibility bool
 }
 
 // Apply mutates project according to build options

pkg/compose/build_bake.go

@@ -184,7 +184,7 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
 
 		cfg.Targets[serviceName] = bakeTarget{
 			Context:          build.Context,
-			Contexts:         additionalContexts(build.AdditionalContexts, service.DependsOn, options.Compatibility),
+			Contexts:         additionalContexts(build.AdditionalContexts, service.DependsOn),
 			Dockerfile:       dockerFilePath(build.Context, build.Dockerfile),
 			DockerfileInline: build.DockerfileInline,
 			Args:             args,
@@ -320,12 +320,10 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
 	return results, nil
 }
 
-func additionalContexts(contexts types.Mapping, dependencies types.DependsOnConfig, compatibility bool) map[string]string {
+func additionalContexts(contexts types.Mapping, dependencies types.DependsOnConfig) map[string]string {
 	ac := map[string]string{}
-	if compatibility {
-		for name := range dependencies {
-			ac[name] = "target:" + name
-		}
+	for name := range dependencies {
+		ac[name] = "target:" + name
 	}
 	for k, v := range contexts {
 		ac[k] = v