d48d41f4e2
bump gRPC to v1.3.0, add genproto, update protobuf
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 74ec7a5b2c
2017-07-03 17:40:36 -07:00
9ee14880db
Bump SwarmKit to 79381d0840be27f8b3f5c667b348a4467d866eeb
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 585e099a9a
2017-07-03 17:40:28 -07:00
c914e1a6cd
Merge pull request #213 from dnephin/improve-swarm-ca-cmd
...
Refactor and UI changes to `swarm ca` command
Upstream-commit: 85b41c3e71
2017-07-03 17:02:45 +02:00
3bd733bca1
Merge pull request #273 from adshmh/add-unit-tests-to-task-package
...
add unit tests to task package
Upstream-commit: 379b762495
2017-06-30 11:41:24 -04:00
d97f0f6543
Merge pull request #268 from albers/completion-swarm-ca
...
Add bash completion for `swarm ca`
Upstream-commit: afcc75ddfe
2017-06-30 11:42:28 +02:00
5cf169cc6a
Merge pull request #269 from albers/completion-swarm-init--data-path-addr
...
Fix bash completion for `swarm init|join --data-path-addr`
Upstream-commit: 9689ccab1b
2017-06-30 10:29:35 +02:00
88fc3881d6
Merge pull request #250 from albers/completion-service-create--detach
...
Add bash completion for `service create --detach`
Upstream-commit: b306817220
2017-06-30 01:16:19 -07:00
fb07a8e807
Merge pull request #256 from albers/completion-service-update-order
...
Add bash completion for `service create|update (update|rollback)-order`
Upstream-commit: c726ccaf6c
2017-06-30 01:12:57 -07:00
67050e7a6f
Merge pull request #257 from albers/completion-service--network-add
...
Add bash completion for `service create|update --network-(add|rm)`
Upstream-commit: 321c692868
2017-06-30 01:11:22 -07:00
1e38251e9a
Merge pull request #251 from albers/completion-plugin-events
...
Add bash completion for plugin events
Upstream-commit: d1ccfcaf2a
2017-06-30 01:02:53 -07:00
72ce4394de
Merge pull request #254 from albers/completion-system-prune--volumes
...
Add bash completion for `system prune --volumes`
Upstream-commit: 495ab9b3e9
2017-06-30 01:01:14 -07:00
46544e3ed0
Merge pull request #249 from albers/completion-fix-network-create--internal
...
Fix bash completion for `network create --internal`
Upstream-commit: b45c7d614e
2017-06-30 00:11:38 -07:00
b7f79e8cec
Merge pull request #247 from albers/completion-service--entrypoint
...
Add bash completion for `service create|update --entrypoint`
Upstream-commit: 1c4d070cf5
2017-06-30 00:09:20 -07:00
57f1273555
Merge pull request #239 from albers/completion-network-create--ingress
...
Add bash completion for `docker network create --ingress`
Upstream-commit: 993b78d276
2017-06-30 00:05:44 -07:00
5edabea811
Merge pull request #233 from dnephin/build-stdin-with-compress
...
Build stdin with compress
Upstream-commit: 0b050a599f
2017-06-29 18:38:55 -07:00
358ed9d030
Merge pull request #244 from thaJeztah/tiny-builder-docs-improvements
...
Some builder docs improvements
Upstream-commit: 40a636efc1
2017-06-29 18:34:03 -07:00
04259ca4ac
add unit tests to task package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 244e28f41f
2017-06-29 17:57:31 -04:00
05c34f9c1a
Refactor caCommand
...
Split out a swarmCAOptions struct for options that are shared between
the ca and update commands.
Change the 'no trust root' message to an error.
Add some unit tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 81e9837859
2017-06-29 17:57:06 -04:00
129c66c19b
Some builder docs improvements
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 29b419eed5
2017-06-29 14:20:16 -07:00
27d5d2149c
Compress after rewriting the archive.
...
Write a test showing compress failure.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a04aa8fe28
2017-06-29 13:18:10 -04:00
d8218cc6ef
Merge pull request #227 from dnephin/expose-config
...
expose config credentials without needing the Cli
Upstream-commit: 74af31be7f
2017-06-29 19:11:37 +02:00
c54c912237
Merge pull request #238 from vdemeester/update-go-connections
...
Update go-connections dependency
Upstream-commit: 8de604c857
2017-06-29 18:04:27 +02:00
38c47208e6
Merge pull request #255 from albers/system-prune-volume-warning
...
system prune: only warn for volumes if --volumes is given
Upstream-commit: 64486d7820
2017-06-29 08:50:16 -07:00
4815e9227a
Fix bash completion for swarm init|join --data-path-addr
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: fa4dc8820a
2017-06-29 16:45:18 +02:00
7c199971a1
Add bash completion for swarm ca
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5bd00a563e
2017-06-29 16:28:50 +02:00
7b10a8b5c9
system prune: only warn about volumes if --volumes is given
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 849b0e96a0
2017-06-29 15:07:21 +02:00
2483818fef
Merge pull request #262 from cdrage/on-failure-error
...
on_failure -> on-failure in compose code
Upstream-commit: 4c88a1cb53
2017-06-29 09:04:15 +02:00
fcdcc589ed
Merge pull request #258 from adshmh/fix-daemon-unit-tests-output-leak
...
fixed output leak from daemon unit tests
Upstream-commit: e4e08baeba
2017-06-29 09:03:51 +02:00
5570d38a23
Merge pull request #215 from imkin/default-max-size-param-doc
...
Adding docs for "overlay2.size" storage-opt
Upstream-commit: 0ec3e8a8d5
2017-06-28 14:23:34 -07:00
f397c29ebe
on_failure -> on-failure in compose code
...
on_failure should be on-failure
Signed-off-by: Charlie Drage <charlie@charliedrage.com >
Upstream-commit: d3f9a6c610
2017-06-28 11:10:02 -04:00
d034f04bc4
Merge pull request #260 from aaronlehmann/verify-message
...
progress: Show success message when finished counting down
Upstream-commit: 92a2a1d539
2017-06-28 09:30:49 +02:00
241ddf7729
Adding docs for "overlay2.size" storage-opt
...
Signed-off-by: Dhawal Yogesh Bhanushali <dbhanushali@vmware.com >
Upstream-commit: ff2552f7a1
2017-06-27 23:58:57 -07:00
ad9f81da7f
progress: Show success message when finished counting down
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 82e069026b
2017-06-27 15:07:10 -07:00
2bf9a1e1f5
fixed the output leak from daemon unit tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 69b226a89c
2017-06-27 14:22:49 -04:00
d4b74e4fd3
Add bash completion for service create|update --network-(add|rm)
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: fa0f470a5f
2017-06-27 17:43:05 +02:00
2d54e9fa16
Add bash completion for service create|update (update|rollback)-order
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 71dd0e0b66
2017-06-27 17:32:43 +02:00
7fb6cb009c
Add bash completion for system prune --volumes
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 36b572dfdf
2017-06-27 16:37:41 +02:00
ac616d52fb
Rename NewConfigFile to New in configfile package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 105b21d1ab
2017-06-27 16:31:38 +02:00
55b50a2ecf
Add bash completion for plugin events
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f0f7150537
2017-06-27 15:37:14 +02:00
284dc93fb1
Add missing unit tests.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 62dfbef4d8
2017-06-27 13:46:47 +02:00
2f4e7d39ca
Move credential getting functions to the ConfigFile.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a3cbc70147
2017-06-27 13:46:47 +02:00
c380487034
Cleanup config/credentials, remove dependency on config file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 33cbb70270
2017-06-27 13:45:50 +02:00
4682e5be27
Move config file loading to more appropriate packages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a8c70e43a3
2017-06-27 13:45:50 +02:00
098742e654
Add bash completion for service create --detach
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8baef1098e
2017-06-27 12:58:38 +02:00
7a7da398c1
Fix bash completion for network create --internal
...
`--internal` is a boolean option. It was falsely treated as non-boolean.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 12dc9eb11f
2017-06-27 12:39:27 +02:00
7612cca1fe
Add bash completion for service create|update --entrypoint
...
Also fixes a wrong option: `--arg` should be `--args`.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e0462e8472
2017-06-27 11:54:05 +02:00
59836240bc
Merge pull request #230 from mstanleyjones/remove-userns-details
...
Remove specific config info about userns-remap
Upstream-commit: 2eac0bb7b7
2017-06-26 21:11:53 -07:00
146ac6efc7
Merge pull request #225 from mstanleyjones/ps-markdown-formatting
...
Reformat filtering options in ps ref
Upstream-commit: 8fc3179111
2017-06-26 21:05:42 -07:00
f453764eee
Merge pull request #207 from cyli/warn-swarm-ca-command
...
If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed
Upstream-commit: cfff0e2259
2017-06-26 20:56:54 -07:00
0fcd0709a5
Merge pull request #219 from vieux/scale
...
hide `--detach` for docker < 17.05
Upstream-commit: c3e5445659
2017-06-26 20:47:39 -07:00
