From 5470312d236445b54bb6723f47c0966d3b057658 Mon Sep 17 00:00:00 2001
From: Dong Chen <dongluo.chen@docker.com>
Date: Thu, 5 Jan 2017 11:21:22 -0800
Subject: [PATCH] add port PublishMode to service inspect --pretty output

Signed-off-by: Dong Chen <dongluo.chen@docker.com>
---
 cli/command/formatter/service.go              | 1 +
 cli/command/service/update.go                 | 6 +-----
 docs/reference/commandline/service_inspect.md | 9 ++++++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cli/command/formatter/service.go b/cli/command/formatter/service.go
index 2690029ce4..8242e1cb9e 100644
--- a/cli/command/formatter/service.go
+++ b/cli/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/cli/command/service/update.go b/cli/command/service/update.go
index 514b1bd510..f1e41c5cdb 100644
--- a/cli/command/service/update.go
+++ b/cli/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
diff --git a/docs/reference/commandline/service_inspect.md b/docs/reference/commandline/service_inspect.md
index 8b4ab62d89..413ae99c29 100644
--- a/docs/reference/commandline/service_inspect.md
+++ b/docs/reference/commandline/service_inspect.md
@@ -125,15 +125,18 @@ Service Mode:	REPLICATED
 Placement:
 UpdateConfig:
  Parallelism:	0
+ On failure:	pause
+ Max failure ratio:	0
 ContainerSpec:
  Image:		nginx:alpine
 Resources:
+Networks:	net1
 Endpoint Mode:  vip
 Ports:
- Name =
- Protocol = tcp
- TargetPort = 443
  PublishedPort = 4443
+  Protocol = tcp
+  TargetPort = 443
+  PublishMode = ingress
 ```
 
 You can also use `--format pretty` for the same effect.