From 45c8a3ddd57b8097c46fedaa5dd1cd80f4eee1da Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Mon, 25 Jul 2016 19:17:06 -0700 Subject: [PATCH] Prevent panic on update --container-label-add Signed-off-by: Tibor Vass (cherry picked from commit e462b4507a7020ae96ec4f4806877bff3a0cae99) Signed-off-by: Tibor Vass --- api/client/service/update.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/client/service/update.go b/api/client/service/update.go index 392daf06b3..c9de40e0e6 100644 --- a/api/client/service/update.go +++ b/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) { if flags.Changed(flagContainerLabelAdd) { - if field == nil { + if *field == nil { *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() for _, label := range toRemove { delete(*field, label)