소스 검색

add default compose labels to images built from bake

Signed-off-by: Guillaume Lours <[email protected]>
Guillaume Lours 7 달 전
부모
커밋
5e147e852e
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      pkg/compose/build_bake.go

+ 2 - 1
pkg/compose/build_bake.go

@@ -164,6 +164,7 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
 			continue
 			continue
 		}
 		}
 		build := *service.Build
 		build := *service.Build
+		labels := getImageBuildLabels(project, service)
 
 
 		args := types.Mapping{}
 		args := types.Mapping{}
 		for k, v := range resolveAndMergeBuildArgs(s.dockerCli, project, service, options) {
 		for k, v := range resolveAndMergeBuildArgs(s.dockerCli, project, service, options) {
@@ -209,7 +210,7 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
 			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,
-			Labels:           build.Labels,
+			Labels:           labels,
 			Tags:             append(build.Tags, api.GetImageNameOrDefault(service, project.Name)),
 			Tags:             append(build.Tags, api.GetImageNameOrDefault(service, project.Name)),
 
 
 			CacheFrom:    build.CacheFrom,
 			CacheFrom:    build.CacheFrom,