Browse code

Append --registry-auth with with

`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Vincent Demeester authored on 2016/07/22 17:38:56
Showing 8 changed files
... ...
@@ -547,7 +547,7 @@ const (
547 547
 	flagUpdateDelay        = "update-delay"
548 548
 	flagUpdateParallelism  = "update-parallelism"
549 549
 	flagUser               = "user"
550
-	flagRegistryAuth       = "registry-auth"
550
+	flagRegistryAuth       = "with-registry-auth"
551 551
 	flagLogDriver          = "log-driver"
552 552
 	flagLogOpt             = "log-opt"
553 553
 )
... ...
@@ -19,7 +19,7 @@ func addBundlefileFlag(opt *string, flags *pflag.FlagSet) {
19 19
 }
20 20
 
21 21
 func addRegistryAuthFlag(opt *bool, flags *pflag.FlagSet) {
22
-	flags.BoolVar(opt, "registry-auth", false, "Send registry authentication details to Swarm agents")
22
+	flags.BoolVar(opt, "with-registry-auth", false, "Send registry authentication details to Swarm agents")
23 23
 }
24 24
 
25 25
 func loadBundlefile(stderr io.Writer, namespace string, path string) (*bundlefile.Bundlefile, error) {
... ...
@@ -1733,7 +1733,7 @@ _docker_service_update() {
1733 1733
 
1734 1734
 	local boolean_options="
1735 1735
 		--help
1736
-		--registry-auth
1736
+		--with-registry-auth
1737 1737
 	"
1738 1738
 
1739 1739
 	__docker_complete_log_driver_options && return
... ...
@@ -1087,7 +1087,6 @@ __docker_service_subcommand() {
1087 1087
         "($help)--name=[Service name]:name: "
1088 1088
         "($help)*--network=[Network attachments]:network: "
1089 1089
         "($help)*"{-p=,--publish=}"[Publish a port as a node port]:port: "
1090
-        "($help)--registry-auth[Send registry authentication details to swarm agents]"
1091 1090
         "($help)--replicas=[Number of tasks]:replicas: "
1092 1091
         "($help)--reserve-cpu=[Reserve CPUs]:value: "
1093 1092
         "($help)--reserve-memory=[Reserve Memory]:value: "
... ...
@@ -1099,6 +1098,7 @@ __docker_service_subcommand() {
1099 1099
         "($help)--update-delay=[Delay between updates]:delay: "
1100 1100
         "($help)--update-parallelism=[Maximum number of tasks updated simultaneously]:number: "
1101 1101
         "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users"
1102
+        "($help)--with-registry-auth[Send registry authentication details to swarm agents]"
1102 1103
         "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories"
1103 1104
     )
1104 1105
 
... ...
@@ -17,9 +17,9 @@ Usage:  docker deploy [OPTIONS] STACK
17 17
 Create and update a stack from a Distributed Application Bundle (DAB)
18 18
 
19 19
 Options:
20
-      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
21
-      --help            Print usage
22
-      --registry-auth   Send registry authentication details to swarm agents
20
+      --file   string        Path to a Distributed Application Bundle file (Default: STACK.dab)
21
+      --help                 Print usage
22
+      --with-registry-auth   Send registry authentication details to swarm agents
23 23
 ```
24 24
 
25 25
 Create and update a stack from a `dab` file. This command has to be
... ...
@@ -31,7 +31,6 @@ Options:
31 31
       --name string                  Service name
32 32
       --network value                Network attachments (default [])
33 33
   -p, --publish value                Publish a port as a node port (default [])
34
-      --registry-auth                Send registry authentication details to swarm agents
35 34
       --replicas value               Number of tasks (default none)
36 35
       --reserve-cpu value            Reserve CPUs (default 0.000)
37 36
       --reserve-memory value         Reserve Memory (default 0 B)
... ...
@@ -43,6 +42,7 @@ Options:
43 43
       --update-delay duration        Delay between updates
44 44
       --update-parallelism uint      Maximum number of tasks updated simultaneously
45 45
   -u, --user string                  Username or UID
46
+      --with-registry-auth           Send registry authentication details to Swarm agents
46 47
   -w, --workdir string               Working directory inside the container
47 48
 ```
48 49
 
... ...
@@ -38,7 +38,6 @@ Options:
38 38
       --network-rm value             Remove a network by name (default [])
39 39
       --publish-add value            Add or update a published port (default [])
40 40
       --publish-rm value             Remove a published port by its target port (default [])
41
-      --registry-auth                Send registry authentication details to swarm agents
42 41
       --replicas value               Number of tasks (default none)
43 42
       --reserve-cpu value            Reserve CPUs (default 0.000)
44 43
       --reserve-memory value         Reserve Memory (default 0 B)
... ...
@@ -50,6 +49,7 @@ Options:
50 50
       --update-delay duration        Delay between updates
51 51
       --update-parallelism uint      Maximum number of tasks updated simultaneously
52 52
   -u, --user string                  Username or UID
53
+      --with-registry-auth           Send registry authentication details to Swarm agents
53 54
   -w, --workdir string               Working directory inside the container
54 55
 ```
55 56
 
... ...
@@ -44,9 +44,9 @@ Usage:  docker deploy [OPTIONS] STACK
44 44
 Create and update a stack
45 45
 
46 46
 Options:
47
-      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
48
-      --help            Print usage
49
-      --registry-auth   Send registry authentication details to Swarm agents
47
+      --file   string        Path to a Distributed Application Bundle file (Default: STACK.dab)
48
+      --help                 Print usage
49
+      --with-registry-auth   Send registry authentication details to Swarm agents
50 50
 ```
51 51
 
52 52
 Let's deploy the stack created before: