From e8ad538d90190d81ecef623de92d089409f26fcf Mon Sep 17 00:00:00 2001 From: Dong Chen Date: Thu, 5 Jan 2017 11:21:22 -0800 Subject: [PATCH] add port PublishMode to service inspect --pretty output Signed-off-by: Dong Chen --- command/formatter/service.go | 1 + command/service/update.go | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/command/formatter/service.go b/command/formatter/service.go index 2690029ce4..8242e1cb9e 100644 --- a/command/formatter/service.go +++ b/command/formatter/service.go @@ -103,6 +103,7 @@ Ports: PublishedPort {{ $port.PublishedPort }} Protocol = {{ $port.Protocol }} TargetPort = {{ $port.TargetPort }} + PublishMode = {{ $port.PublishMode }} {{- end }} {{ end -}} ` diff --git a/command/service/update.go b/command/service/update.go index 514b1bd510..f1e41c5cdb 100644 --- a/command/service/update.go +++ b/command/service/update.go @@ -691,11 +691,7 @@ portLoop: ports := flags.Lookup(flagPublishAdd).Value.(*opts.PortOpt).Value() for _, port := range ports { - if v, ok := portSet[portConfigToString(&port)]; ok { - if v != port { - fmt.Println("v", v) - return fmt.Errorf("conflicting port mapping between %v:%v/%s and %v:%v/%s", port.PublishedPort, port.TargetPort, port.Protocol, v.PublishedPort, v.TargetPort, v.Protocol) - } + if _, ok := portSet[portConfigToString(&port)]; ok { continue } //portSet[portConfigToString(&port)] = port