97039324c0
Merge pull request #24885 from vdemeester/24875-registrauth-with
...
Rename `--registry-auth` to `--with-registry-auth`
2016-07-22 19:05:49 +02:00
8426f72107
Append --registry-auth with with
...
`--with-registry-auth` is more explicit.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-22 10:38:56 +02:00
58ba4c313b
Reorder swarm commands
...
This way "join-token" appears next to "join" in the help output.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-21 18:08:41 -07:00
f5e1f6f688
Merge pull request #24823 from aaronlehmann/join-tokens
...
Replace secrets with join tokens
2016-07-21 18:06:55 -07:00
2cc5bd33ee
Replace secrets with join tokens
...
Implement the proposal from
https://github.com/docker/docker/issues/24430#issuecomment-233100121
Removes acceptance policy and secret in favor of an automatically
generated join token that combines the secret, CA hash, and
manager/worker role into a single opaque string.
Adds a docker swarm join-token subcommand to inspect and rotate the
tokens.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-21 15:23:03 -07:00
0a8a6f2dd7
Merge pull request #24871 from thaJeztah/fix-wrong-case-mount-type
...
Change mount-types to lowercase
2016-07-22 00:03:55 +02:00
22d020276c
Merge pull request #24700 from nishanttotla/pass-registry-auth-on-deploy
...
Send registry auth token for service deploy
2016-07-21 12:33:33 +02:00
8f93128cd6
Change mount-types to lowercase
...
these values were changed to lowercase in
690cb2d08c
2016-07-21 11:25:42 +02:00
a40b5820c9
api/client/service: shorten to volume-opt
...
`volume-driver-opt` was too verbose for its own existence and the sanity
of those in the vicinity. The much better, sleeker `volume-opt` replaces
it. 7 bytes and a case of carpal tunnel syndrome are saved!
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-20 16:08:36 -07:00
a26bdd8607
Send registry auth token for service deploy
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-07-20 16:07:07 -07:00
2a78789ad1
Merge pull request #24266 from allencloud/add_cmd_docker_stack_services_STACKNAME
...
add command `docker stack services STACKNAME`
2016-07-20 18:38:08 +02:00
06f35262c4
Rename --bundle to --file
...
This renames the '--bundle' flag for docker (stack) deploy
to be consistent with 'docker build'.
Note that there's no shorthand '-f' added for now,
because this may be confusing on 'docker stack config',
which also takes a file, and for which we may want to
have a '--format' flag in future.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 16:03:27 +02:00
3d4bde92b7
Merge pull request #24832 from npcode/fix-service-rm-usage
...
Fix the usage for `service rm` command
2016-07-20 06:44:34 -04:00
cf61cd3a92
Fix the usage for `service rm` command
...
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-07-20 18:27:26 +09:00
2ee828aac2
Merge pull request #24802 from vdemeester/stack-docs-and-flags
...
Add documentation for stack commands
2016-07-19 14:30:49 -04:00
10919e8909
Add documentation for stack commands
...
Also removes the `-f` flags of bundle to follow the single-letter flags
evaluation.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-19 18:32:44 +02:00
47cca88c8c
Dont run man generation as part of test-unit.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-19 12:00:35 -04:00
25e9b06ac0
Set Long text for volume commands so they can be used to generate man pages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-19 12:00:21 -04:00
68e52febde
Merge pull request #24722 from thaJeztah/update-usage-for-deprecated-flags
...
Don't automagically add "[OPTIONS]" to usage
2016-07-19 11:01:33 -04:00
4b21b411ec
add command `docker stack services STACKNAME`
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-19 14:21:58 +08:00
dc0d6040e4
Merge pull request #24397 from dongluochen/nodelabels
...
support node label update
2016-07-19 07:55:24 +02:00
1796680381
Merge pull request #24476 from stevvooe/services-log-driver-support
...
swarm: add log driver support for services
2016-07-18 19:08:12 -07:00
e1165cdfd1
Support node label update.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-07-18 18:39:52 -07:00
e6a97db2c9
Merge pull request #23878 from jstarks/fix_windows_console
...
Windows: Always enable VT emulation
2016-07-18 16:23:04 -07:00
340964db1c
Merge pull request #24692 from anusha-ragunathan/plugins-ux
...
Print plugin name on successful install, enable and disable.
2016-07-19 01:09:35 +02:00
4f0b510552
Don't automagically add "[OPTIONS]" to usage
...
This removes the logic to automatically
add [OPTIONS] to the usage output.
The current logic was broken if a command
only has deprecated or hidden flags, and
in many cases put the [OPTIONS] in the
wrong location.
Requiring the usage string to be set
manually gives more predictable results,
and shouldn't require much to maintain.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-19 00:07:19 +02:00
6dca1e6d3f
Print plugin name on successful install, enable and disable.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-07-18 09:47:12 -07:00
98a4b3e332
Merge pull request #24714 from allencloud/better-docker-network-create-help-output
...
better command `docker network create -h` output
2016-07-18 16:05:46 +00:00
0d459f5ed3
fix typo creats into creates in comments
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-16 17:55:18 +08:00
d0081a0f47
better command `docker network create -h` output
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-16 15:32:17 +08:00
e778ba2d5b
swarm: add log driver support for services
...
Adds log driver support for service creation and update. Add flags
`--log-driver` and `--log-opt` to match `docker run`. Log drivers are
configured per service.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-15 21:39:27 -07:00
909c596fa5
Only show port name if set.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-15 16:02:04 -04:00
83f232e186
Merge pull request #23773 from dnephin/allow-remove-during-update
...
Add remove flags for service update
2016-07-14 11:10:30 +02:00
ffd03708e9
Merge pull request #24615 from aaronlehmann/spaces-not-tabs
...
Use spaces, not tabs, to format sample "swarm join" command
2016-07-14 11:07:12 +02:00
08ae4e544d
Fix service inspect --pretty.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-07-14 00:11:29 -07:00
6de8fcb2f2
Use spaces, not tabs, to format sample "swarm join" command
...
Using tabs here seems to cause copy/paste problems in some terminals.
Using spaces is safer.
Fixes #24609
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-13 19:31:05 -06:00
1c6a8715ab
Merge pull request #24592 from thaJeztah/remove-dead-code
...
Remove dead code for "inspect --pretty"
2016-07-13 14:46:42 -07:00
3249c1d0e7
Fix multi-remove during service update.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 16:11:08 -04:00
4c6faa4340
Change the add/update flags to include 'add'
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 16:06:25 -04:00
ead1f62aba
PR feedback
...
improve help text for service update remove flags
implement proper merge update of placement flag
more code re-use in update functions using a toRemove set.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 16:06:25 -04:00
dc33fc1ff4
Add remove flags for service update
...
with unit tests
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 16:06:25 -04:00
fd8269b8f6
Merge pull request #24195 from dnephin/service-update-better-args-and-command
...
Update service `args` with a single flag (shlex)
2016-07-13 13:02:19 -07:00
4d87f9083b
Remove dead code for "inspect --pretty"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 18:56:02 +02:00
7bf0faf423
Remove shorthand flags for "mount", "pretty", and "no-resolve"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 18:47:29 +02:00
674d227445
Merge service command and args as a string.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 12:31:16 -04:00
58624acf11
Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
...
Remove --command flag for service update
2016-07-13 16:01:11 +00:00
e4a024d590
Remove --command flag for service update
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-13 16:19:21 +02:00
92b1577871
Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency
...
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
2016-07-13 15:13:58 +02:00
ea365e4cb3
Make labels human readable
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 01:08:54 +02:00
7da11b1afd
Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept
...
Add comma-separated --auto-accept support.
2016-07-12 16:29:21 +02:00
Vincent Demeester
Aaron Lehmann
Tibor Vass
Sebastiaan van Stijn
Sebastiaan van Stijn
Stephen J Day
Nishant Totla
Doug Davis
Yi EungJun
Brian Goff
Daniel Nephin
Daniel Nephin
allencloud
Dong Chen
Anusha Ragunathan
Arnaud Porterie