diff options
| author | Tibor Vass <tibor@docker.com> | 2016-07-25 19:17:06 -0700 |
|---|---|---|
| committer | Tibor Vass <tibor@docker.com> | 2016-07-26 03:51:43 -0700 |
| commit | 45c8a3ddd57b8097c46fedaa5dd1cd80f4eee1da (patch) | |
| tree | 7e8d2fcedc602ebcf953221291b248fd01e62bb3 | |
| parent | 8fe03baa410b897818cc5b998b8f117fe7f3218b (diff) | |
| download | docker-45c8a3ddd57b8097c46fedaa5dd1cd80f4eee1da.tar.gz | |
Prevent panic on update --container-label-add
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e462b4507a7020ae96ec4f4806877bff3a0cae99)
Signed-off-by: Tibor Vass <tibor@docker.com>
| -rw-r--r-- | api/client/service/update.go | 4 |
1 files 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) |