Commit Graph

2151 Commits

Author SHA1 Message Date
c4a861fdf5 api/client/service: default update parallelism to 1
When updates happen, the current behavior is to kill all running
instances and dispatch new tasks. Common use cases for container updates
involve small numbers of containers, meaning the app will go down on
most updates. Setting parallelism to 1 ensures that at most one task
will go down during the update. Services with higher replica counts can
increase this number accordingly to meet their needs.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 67246afd3dbcb53fea470bd3e45578370207139d
Component: engine
2016-07-22 17:13:58 -07:00
d557e73d7c Merge pull request #24885 from vdemeester/24875-registrauth-with
Rename `--registry-auth` to `--with-registry-auth`
Upstream-commit: 97039324c0e5621f6aa2c6e1d1c809384463e4a8
Component: engine
2016-07-22 19:05:49 +02:00
1ec535a2d9 Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8426f72107f351b769babadeabbf13f205126514
Component: engine
2016-07-22 10:38:56 +02:00
0f55365ad3 Reorder swarm commands
This way "join-token" appears next to "join" in the help output.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 58ba4c313b1f19dfb1d50cb32238045d7b3db91d
Component: engine
2016-07-21 18:08:41 -07:00
79e3f2c256 Merge pull request #24823 from aaronlehmann/join-tokens
Replace secrets with join tokens
Upstream-commit: f5e1f6f6880391a5a3399023cf93a3c48502e57d
Component: engine
2016-07-21 18:06:55 -07:00
b141a44de0 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>
Upstream-commit: 2cc5bd33eef038bf5721582e2410ba459bb656e9
Component: engine
2016-07-21 15:23:03 -07:00
cafdfcad31 Merge pull request #24871 from thaJeztah/fix-wrong-case-mount-type
Change mount-types to lowercase
Upstream-commit: 0a8a6f2dd7850cc467244ba254d5e20555df99dc
Component: engine
2016-07-22 00:03:55 +02:00
5614c24f22 Merge pull request #24700 from nishanttotla/pass-registry-auth-on-deploy
Send registry auth token for service deploy
Upstream-commit: 22d020276cfd6df3482523bc680c775d6a0c57ca
Component: engine
2016-07-21 12:33:33 +02:00
acb2cc6fda Change mount-types to lowercase
these values were changed to lowercase in
690cb2d08c,
but not changed accordingly in docker/docker.

this changes the mounttypes to lowercase

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8f93128cd619e1d11be1bc0ae21f1362b1e3f9ad
Component: engine
2016-07-21 11:25:42 +02:00
3087bde702 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>
Upstream-commit: a40b5820c91640183b40e0668f6802415e6adc14
Component: engine
2016-07-20 16:08:36 -07:00
2332ccb8c3 Send registry auth token for service deploy
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: a26bdd8607c62e6e736d06e9ec8f0908c4808d74
Component: engine
2016-07-20 16:07:07 -07:00
9e5ae213df Merge pull request #24266 from allencloud/add_cmd_docker_stack_services_STACKNAME
add command `docker stack services STACKNAME`
Upstream-commit: 2a78789ad1e5a980a6822d90d7a5039ac7af1252
Component: engine
2016-07-20 18:38:08 +02:00
76dae42c92 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>
Upstream-commit: 06f35262c47629fef78e36daaa2742c2c0d7c3a9
Component: engine
2016-07-20 16:03:27 +02:00
f9814c5993 Merge pull request #24832 from npcode/fix-service-rm-usage
Fix the usage for `service rm` command
Upstream-commit: 3d4bde92b72c963a01419c4827909e355b44e6f2
Component: engine
2016-07-20 06:44:34 -04:00
a90f40fdaf Fix the usage for service rm command
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: cf61cd3a920809f6a0be44a584f365544acaf1a9
Component: engine
2016-07-20 18:27:26 +09:00
fcffdb424a Merge pull request #24802 from vdemeester/stack-docs-and-flags
Add documentation for stack commands
Upstream-commit: 2ee828aac25495e2ff61d48bd81a5d70d955a06a
Component: engine
2016-07-19 14:30:49 -04:00
918c17adbd 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>
Upstream-commit: 10919e890942cbdaa65f180dbcd475d21b9c6713
Component: engine
2016-07-19 18:32:44 +02:00
a764e64f97 Dont run man generation as part of test-unit.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 47cca88c8c151ebf3dd25adcf28ac1b2f75c76fb
Component: engine
2016-07-19 12:00:35 -04:00
b77059c741 Set Long text for volume commands so they can be used to generate man pages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 25e9b06ac0750396f35d3f52f71c44b1072f0972
Component: engine
2016-07-19 12:00:21 -04:00
8bb6df73dc Merge pull request #24722 from thaJeztah/update-usage-for-deprecated-flags
Don't automagically add "[OPTIONS]" to usage
Upstream-commit: 68e52febdee553c2768ac7ea54817e0657d5ce8a
Component: engine
2016-07-19 11:01:33 -04:00
34b01d4562 add command docker stack services STACKNAME
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4b21b411ecf4b43b16bdd7f4b78df8a362503724
Component: engine
2016-07-19 14:21:58 +08:00
2a8da813b8 Merge pull request #24397 from dongluochen/nodelabels
support node label update
Upstream-commit: dc0d6040e48bcb715ee35fae23e85d50034b483e
Component: engine
2016-07-19 07:55:24 +02:00
a9e33b5e83 Merge pull request #24476 from stevvooe/services-log-driver-support
swarm: add log driver support for services
Upstream-commit: 1796680381e7cb35eda14243a3fba1ac911ff908
Component: engine
2016-07-18 19:08:12 -07:00
5da3c90cb2 Support node label update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: e1165cdfd1d666b1d4e041ef6a0d5fd049e041c1
Component: engine
2016-07-18 18:39:52 -07:00
7078c249a4 Merge pull request #23878 from jstarks/fix_windows_console
Windows: Always enable VT emulation
Upstream-commit: e6a97db2c932a2b80180c10f2896d7594108a406
Component: engine
2016-07-18 16:23:04 -07:00
32c154633c Merge pull request #24692 from anusha-ragunathan/plugins-ux
Print plugin name on successful install, enable and disable.
Upstream-commit: 340964db1c8f161a2ad156023eb47dcc93bf804b
Component: engine
2016-07-19 01:09:35 +02:00
24235167aa 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>
Upstream-commit: 4f0b5105524649169d765bb94c2806209ab21904
Component: engine
2016-07-19 00:07:19 +02:00
adb3025793 Print plugin name on successful install, enable and disable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 6dca1e6d3f875de7a6652390f65fdb8ec2623e3b
Component: engine
2016-07-18 09:47:12 -07:00
a878f5d7fb Merge pull request #24714 from allencloud/better-docker-network-create-help-output
better command `docker network create -h` output
Upstream-commit: 98a4b3e332b908d5be6f59a0612b597653ccdee0
Component: engine
2016-07-18 16:05:46 +00:00
1a39748b71 fix typo creats into creates in comments
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0d459f5ed3138f6273c4f10d4796197faaf1ad2d
Component: engine
2016-07-16 17:55:18 +08:00
cd03aec1cb better command docker network create -h output
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d0081a0f476f91b0dc6b28c480e7c95c06b05ebb
Component: engine
2016-07-16 15:32:17 +08:00
aa2ddf3393 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>
Upstream-commit: e778ba2d5b1e5074fe413dffaa365f3d37b175c7
Component: engine
2016-07-15 21:39:27 -07:00
6f7cdfbda7 Only show port name if set.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 909c596fa5956ed02b4708a437a828a2829c9bd5
Component: engine
2016-07-15 16:02:04 -04:00
f883751993 Merge pull request #23773 from dnephin/allow-remove-during-update
Add remove flags for service update
Upstream-commit: 83f232e18670af884d84d10690e0c11c0e2f22b8
Component: engine
2016-07-14 11:10:30 +02:00
87ddd8fdff Merge pull request #24615 from aaronlehmann/spaces-not-tabs
Use spaces, not tabs, to format sample "swarm join" command
Upstream-commit: ffd03708e954ef89eb48c2cd541897e07138b961
Component: engine
2016-07-14 11:07:12 +02:00
3f6cccd448 Fix service inspect --pretty.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 08ae4e544d5744e975da0f89c4f04baa2b8474f2
Component: engine
2016-07-14 00:11:29 -07:00
b84397788e 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>
Upstream-commit: 6de8fcb2f2baf335fc24e10909078199af528e8d
Component: engine
2016-07-13 19:31:05 -06:00
93beda0406 Merge pull request #24592 from thaJeztah/remove-dead-code
Remove dead code for "inspect --pretty"
Upstream-commit: 1c6a8715ab31103f9cde977fa68d2f14b4871adb
Component: engine
2016-07-13 14:46:42 -07:00
e25d6b5a15 Fix multi-remove during service update.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3249c1d0e79f57642b96f6692ffa44f46f15b602
Component: engine
2016-07-13 16:11:08 -04:00
8f0edf84fe Change the add/update flags to include 'add'
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4c6faa434071b87a55256e86020cb78495e9951d
Component: engine
2016-07-13 16:06:25 -04:00
b4c7aa8c2f 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>
Upstream-commit: ead1f62abae5e5ad188536a01fb88d55339e3f63
Component: engine
2016-07-13 16:06:25 -04:00
61271c6fdb Add remove flags for service update
with unit tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: dc33fc1ff433fcc70efc22f5cea9b87c6ec64a3b
Component: engine
2016-07-13 16:06:25 -04:00
5ae05f5a48 Merge pull request #24195 from dnephin/service-update-better-args-and-command
Update service `args` with a single flag (shlex)
Upstream-commit: fd8269b8f65b6b111e234d390e6f2226b85dbc6d
Component: engine
2016-07-13 13:02:19 -07:00
86fb23db37 Remove dead code for "inspect --pretty"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4d87f9083bfb3147566997b3f48c4805229f7c94
Component: engine
2016-07-13 18:56:02 +02:00
bb985637e2 Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7bf0faf42377a91a8535b443201d9ad62326889b
Component: engine
2016-07-13 18:47:29 +02:00
04bb13f6d7 Merge service command and args as a string.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 674d227445887ea2f9a0fde6ebb7838bcce58578
Component: engine
2016-07-13 12:31:16 -04:00
f08872faee Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
Remove --command flag for service update
Upstream-commit: 58624acf11405c482ff0abbc9674cd5441ccce57
Component: engine
2016-07-13 16:01:11 +00:00
1348489290 Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e4a024d5902df1d3db8b9fff8865304afa2305e6
Component: engine
2016-07-13 16:19:21 +02:00
891b2576ba Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
Upstream-commit: 92b15778712ff2eb85bf5b7e00fb4fe4310fd6b1
Component: engine
2016-07-13 15:13:58 +02:00
937633217f Make labels human readable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ea365e4cb37d037046364773d01a744b1258ce4e
Component: engine
2016-07-13 01:08:54 +02:00