瀏覽代碼

Prevent panic on update --container-label-add

Signed-off-by: Tibor Vass <tibor@docker.com>
Tibor Vass 9 年之前
父節點
當前提交
e462b4507a
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      api/client/service/update.go

+ 2 - 2
api/client/service/update.go

@@ -253,7 +253,7 @@ func updatePlacement(flags *pflag.FlagSet, placement *swarm.Placement) {
 
 
 func updateContainerLabels(flags *pflag.FlagSet, field *map[string]string) {
 func updateContainerLabels(flags *pflag.FlagSet, field *map[string]string) {
 	if flags.Changed(flagContainerLabelAdd) {
 	if flags.Changed(flagContainerLabelAdd) {
-		if field == nil {
+		if *field == nil {
 			*field = map[string]string{}
 			*field = map[string]string{}
 		}
 		}
 
 
@@ -263,7 +263,7 @@ func updateContainerLabels(flags *pflag.FlagSet, field *map[string]string) {
 		}
 		}
 	}
 	}
 
 
-	if field != nil && flags.Changed(flagContainerLabelRemove) {
+	if *field != nil && flags.Changed(flagContainerLabelRemove) {
 		toRemove := flags.Lookup(flagContainerLabelRemove).Value.(*opts.ListOpts).GetAll()
 		toRemove := flags.Lookup(flagContainerLabelRemove).Value.(*opts.ListOpts).GetAll()
 		for _, label := range toRemove {
 		for _, label := range toRemove {
 			delete(*field, label)
 			delete(*field, label)