Merge pull request docker#9214 from ndeloof/inconsistent_hash

glours · web-flow · commit ec080f184a6c · 2022-02-28T10:20:36.000+01:00
exclude com.docker.compose.image label from service hash
diff --git a/pkg/compose/build.go b/pkg/compose/build.go
@@ -141,7 +141,7 @@ func (s *composeService) ensureImagesExists(ctx context.Context, project *types.
 			if project.Services[i].Labels == nil {
 				project.Services[i].Labels = types.Labels{}
 			}
-			project.Services[i].Labels[api.ImageDigestLabel] = digest
+			project.Services[i].CustomLabels[api.ImageDigestLabel] = digest
 			project.Services[i].Image = image
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func (s composeService) ensureImagesExists(ctx context.Context, project types.`
`141`	`141`	`if project.Services[i].Labels == nil {`
`142`	`142`	`project.Services[i].Labels = types.Labels{}`
`143`	`143`	`}`
`144`		`- project.Services[i].Labels[api.ImageDigestLabel] = digest`
	`144`	`+ project.Services[i].CustomLabels[api.ImageDigestLabel] = digest`
`145`	`145`	`project.Services[i].Image = image`
`146`	`146`	`}`
`147`	`147`	`}`