Browse Source

define pull and no_cache from either service or flags values when building with bake

Signed-off-by: Guillaume Lours <[email protected]>
Guillaume Lours 3 months ago
parent
commit
bf6d7bf47e
1 changed files with 5 additions and 2 deletions
  1. 5 2
      pkg/compose/build_bake.go

+ 5 - 2
pkg/compose/build_bake.go

@@ -226,6 +226,9 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
 		image := api.GetImageNameOrDefault(service, project.Name)
 		expectedImages[serviceName] = image
 
+		pull := service.Build.Pull || options.Pull
+		noCache := service.Build.NoCache || options.NoCache
+
 		target := targets[serviceName]
 		cfg.Targets[target] = bakeTarget{
 			Context:          build.Context,
@@ -243,8 +246,8 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
 			Target:       build.Target,
 			Secrets:      toBakeSecrets(project, build.Secrets),
 			SSH:          toBakeSSH(append(build.SSH, options.SSHs...)),
-			Pull:         options.Pull,
-			NoCache:      options.NoCache,
+			Pull:         pull,
+			NoCache:      noCache,
 			ShmSize:      build.ShmSize,
 			Ulimits:      toBakeUlimits(build.Ulimits),
 			Entitlements: entitlements,