fixes

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>

pkg/api/labels.go

@@ -32,9 +32,9 @@ const (
 	// ConfigHashLabel stores configuration hash for a compose service
 	ConfigHashLabel = "com.docker.compose.config-hash"
 	// ServiceConfigsHash stores configuration hash for a compose service configs
-	ServiceConfigsHash = "com.docker.compose.service.configs-hash"
+	ServiceConfigsHash = "com.docker.compose.service.%s.configs.hash"
 	// ServiceSecretsHash stores configuration hash for a compose service secrets
-	ServiceSecretsHash = "com.docker.compose.service.secrets-hash"
+	ServiceSecretsHash = "com.docker.compose.service.%s.secrets.hash"
 	// ContainerNumberLabel stores the container index of a replicated service
 	ContainerNumberLabel = "com.docker.compose.container-number"
 	// VolumeLabel allow to track resource related to a compose volume

pkg/compose/convergence.go

@@ -346,20 +346,26 @@ func (c *convergence) mustRecreate(project *types.Project, expected types.Servic
 		return true, nil
 	}
 
-	serviceConfigsHash, err := ServiceConfigsHash(project, expected)
+	serviceNameToConfigHash, err := ServiceConfigsHash(project, expected)
 	if err != nil {
 		return false, err
 	}
 
+	for serviceName, hash := range serviceNameToConfigHash {
+		if actual.Labels[fmt.Sprintf(api.ServiceConfigsHash, serviceName)] != hash {
+			return true, nil
+		}
+	}
+
 	serviceSecretsHash, err := ServiceSecretsHash(project, expected)
 	if err != nil {
 		return false, err
 	}
-	serviceConfigsChanged := actual.Labels[api.ServiceConfigsHash] != serviceConfigsHash
-	serviceSecretsChanged := actual.Labels[api.ServiceSecretsHash] != serviceSecretsHash
 
-	if serviceConfigsChanged || serviceSecretsChanged {
-		return true, nil
+	for serviceName, hash := range serviceSecretsHash {
+		if actual.Labels[fmt.Sprintf(api.ServiceSecretsHash, serviceName)] != hash {
+			return true, nil
+		}
 	}
 
 	if c.networks != nil && actual.State == "running" {

pkg/compose/create.go

@@ -511,23 +511,29 @@ func (s *composeService) prepareLabels(labels types.Labels, project *types.Proje
 		return nil, err
 	}
 
-	serviceConfigsHash, err := ServiceConfigsHash(project, service)
+	serviceNameToConfigHash, err := ServiceConfigsHash(project, service)
 	if err != nil {
 		return nil, err
 	}
 
-	serviceSecretsHash, err := ServiceSecretsHash(project, service)
+	for serviceName, hash := range serviceNameToConfigHash {
+		labels[fmt.Sprintf(api.ServiceConfigsHash, serviceName)] = hash
+	}
+
+	serviceNameToSecretHash, err := ServiceSecretsHash(project, service)
 	if err != nil {
 		return nil, err
 	}
 
+	for serviceName, hash := range serviceNameToSecretHash {
+		labels[fmt.Sprintf(api.ServiceSecretsHash, serviceName)] = hash
+	}
+
 	if number > 0 {
 		// One-off containers are not indexed
 		labels[api.ContainerNumberLabel] = strconv.Itoa(number)
 	}
 	labels[api.ConfigHashLabel] = serviceHash
-	labels[api.ServiceConfigsHash] = serviceConfigsHash
-	labels[api.ServiceSecretsHash] = serviceSecretsHash
 	labels[api.ContainerNumberLabel] = strconv.Itoa(number)
 
 	var dependencies []string

pkg/compose/hash.go

@@ -47,37 +47,37 @@ func ServiceHash(o types.ServiceConfig) (string, error) {
 }
 
 // ServiceConfigsHash computes the configuration hash for service configs.
-func ServiceConfigsHash(project *types.Project, serviceConfig types.ServiceConfig) (string, error) {
-	data := make([]byte, 0)
+func ServiceConfigsHash(project *types.Project, serviceConfig types.ServiceConfig) (map[string]string, error) {
+	serviceNameToHash := make(map[string]string)
 	for _, config := range serviceConfig.Configs {
 		file := project.Configs[config.Source]
 		b, err := createTarForConfig(project, types.FileReferenceConfig(config), types.FileObjectConfig(file))
 
 		if err != nil {
-			return "", err
+			return nil, err
 		}
 
-		data = append(data, b.Bytes()...)
+		serviceNameToHash[config.Target] = digest.SHA256.FromBytes(b.Bytes()).Encoded()
 	}
 
-	return digest.SHA256.FromBytes(data).Encoded(), nil
+	return serviceNameToHash, nil
 }
 
 // ServiceSecretsHash computes the configuration hash for service secrets.
-func ServiceSecretsHash(project *types.Project, serviceConfig types.ServiceConfig) (string, error) {
-	data := make([]byte, 0)
+func ServiceSecretsHash(project *types.Project, serviceConfig types.ServiceConfig) (map[string]string, error) {
+	serviceNameToHash := make(map[string]string)
 	for _, secret := range serviceConfig.Secrets {
 		file := project.Secrets[secret.Source]
 		b, err := createTarForConfig(project, types.FileReferenceConfig(secret), types.FileObjectConfig(file))
 
 		if err != nil {
-			return "", err
+			return nil, err
 		}
 
-		data = append(data, b.Bytes()...)
+		serviceNameToHash[secret.Target] = digest.SHA256.FromBytes(b.Bytes()).Encoded()
 	}
 
-	return digest.SHA256.FromBytes(data).Encoded(), nil
+	return serviceNameToHash, nil
 }
 
 func createTarForConfig(