Merge pull request #1228 from HusterWan/zr/update-env-fix

bugfix: update label compatibility with alidocker

apis/swagger.yml

@@ -2110,10 +2110,10 @@ definitions:
             type: "array"
             items:
               type: "string"
-          Labels:
+          Label:
             description: "List of labels set to container."
-            type: "object"
-            additionalProperties:
+            type: "array"
+            items:
               type: "string"
 
   ContainerUpgradeConfig:

cli/update.go

@@ -58,10 +58,11 @@ func (uc *UpdateCommand) updateRun(args []string) error {
 	container := args[0]
 	ctx := context.Background()
 
-	labels, err := opts.ParseLabels(uc.labels)
-	if err != nil {
-		return err
-	}
+	// UpdateConfig.Label's type change to []string
+	// labels, err := opts.ParseLabels(uc.labels)
+	// if err != nil {
+	// 	return err
+	// }
 
 	if err := opts.ValidateMemorySwappiness(uc.memorySwappiness); err != nil {
 		return err
@@ -95,7 +96,7 @@ func (uc *UpdateCommand) updateRun(args []string) error {
 
 	updateConfig := &types.UpdateConfig{
 		Env:           uc.env,
-		Labels:        labels,
+		Label:         uc.labels,
 		RestartPolicy: restartPolicy,
 		Resources:     resource,
 	}

daemon/mgr/container.go

@@ -881,13 +881,25 @@ func (mgr *ContainerManager) Update(ctx context.Context, name string, config *ty
 		return fmt.Errorf("failed to update container %s: can not update kernel memory to a running container, please stop it first", c.ID())
 	}
 
-	if len(config.Labels) != 0 {
+	// compatibility with alidocker, UpdateConfig.Label is []string
+	// but ContainerConfig.Labels is map[string]string
+	if len(config.Label) != 0 {
 		if c.meta.Config.Labels == nil {
 			c.meta.Config.Labels = map[string]string{}
 		}
 
-		for k, v := range config.Labels {
-			c.meta.Config.Labels[k] = v
+		// support remove some labels
+		newLabels, err := opts.ParseLabels(config.Label)
+		if err != nil {
+			return fmt.Errorf("failed to parse labels: %v", err)
+		}
+
+		for k, v := range newLabels {
+			if v == "" {
+				delete(c.meta.Config.Labels, k)
+			} else {
+				c.meta.Config.Labels[k] = v
+			}
 		}
 	}