From b837f7456d4c29941c766defc4e8b2fade0806e6 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 8 Dec 2016 22:32:10 +0100
Subject: [PATCH] Remove --port and update --publish for services to support
 syntaxes

Add support for simple and complex syntax to `--publish` through the
use of `PortOpt`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 contrib/completion/bash/docker | 6 +++---
 contrib/completion/zsh/_docker | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 7f9a13f710..82d5ef1ead 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -2756,7 +2756,7 @@ _docker_service_update() {
 			--host
 			--mode
 			--name
-			--port
+			--publish
 			--secret
 		"
 
@@ -2803,8 +2803,8 @@ _docker_service_update() {
 			--host-add
 			--host-rm
 			--image
-			--port-add
-			--port-rm
+			--publish-add
+			--publish-rm
 			--secret-add
 			--secret-rm
 		"
diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker
index 229a0edb7f..8d00b13e6d 100644
--- a/contrib/completion/zsh/_docker
+++ b/contrib/completion/zsh/_docker
@@ -1797,7 +1797,7 @@ __docker_service_subcommand() {
                 "($help)*--env-file=[Read environment variables from a file]:environment file:_files" \
                 "($help)--mode=[Service Mode]:mode:(global replicated)" \
                 "($help)--name=[Service name]:name: " \
-                "($help)*--port=[Publish a port]:port: " \
+                "($help)*--publish=[Publish a port]:port: " \
                 "($help -): :__docker_complete_images" \
                 "($help -):command: _command_names -e" \
                 "($help -)*::arguments: _normal" && ret=0
@@ -1870,8 +1870,8 @@ __docker_service_subcommand() {
                 "($help)*--group-add=[Add additional supplementary user groups to the container]:group:_groups" \
                 "($help)*--group-rm=[Remove previously added supplementary user groups from the container]:group:_groups" \
                 "($help)--image=[Service image tag]:image:__docker_complete_repositories" \
-                "($help)*--port-add=[Add or update a port]:port: " \
-                "($help)*--port-rm=[Remove a port(target-port mandatory)]:port: " \
+                "($help)*--publish-add=[Add or update a port]:port: " \
+                "($help)*--publish-rm=[Remove a port(target-port mandatory)]:port: " \
                 "($help)--rollback[Rollback to previous specification]" \
                 "($help -)1:service:__docker_complete_services" && ret=0
             ;;