Commit graph

28649 commits

Author SHA1 Message Date
John Howard
64a42d656b Merge pull request #28185 from Microsoft/jjh/concurrentaccess
Windows: Avoid concurrent access to sysinfo
2016-11-08 19:22:09 -08:00
Victor Vieux
d3c780bb90 Merge pull request #27745 from vieux/cli_backward_compose_api
allow client to talk to an older server
2016-11-08 18:27:23 -08:00
John Howard
54e09aa4e2 Windows: Avoid concurrent access to sysinfo
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-08 17:52:38 -08:00
Victor Vieux
383a2f046b Merge pull request #28088 from aluzzardi/service-ps-task-resolution
service ps: Truncate Task IDs
2016-11-08 17:44:15 -08:00
Victor Vieux
462e57f05e Merge pull request #27567 from yongtang/24391-dns-setting
Add custom DNS settings to service definition
2016-11-08 17:43:00 -08:00
Victor Vieux
c3c58f83b6 Merge pull request #28171 from tonistiigi/fix-fifo-rm-warn
Don’t warn on missing fifo
2016-11-08 17:42:15 -08:00
Victor Vieux
4b63ad33ec Merge pull request #28086 from vieux/delete_rootfs_plugin
delete plugin rootfs on `docker plugin rm`
2016-11-08 17:03:01 -08:00
Sebastiaan van Stijn
3975d648b7 Merge pull request #27420 from Shugyousha/journaldfixes
Small logger journald cleanup
2016-11-09 01:35:08 +01:00
Andrea Luzzardi
d296f7a391 service ps: Truncate Task IDs
- Refactored to move resolution code into the idresolver
- Made `ps` output more bearable by shortening service IDs in task names

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-08 16:17:15 -08:00
Victor Vieux
2d42032225 Merge pull request #27992 from Microsoft/jjh/minapitoinfo
Adds `MinAPIVersion` to docker version
2016-11-08 15:49:33 -08:00
Yong Tang
a39c0cf007 Add custom DNS settings to service update
This fix adds `--dns-add`, `--dns-rm`, `--dns-opt-add`, `--dns-opt-rm`,
`--dns-search-add` and `--dns-search-rm` to `service update`.

An integration test and a unit test have been added to cover the changes in this fix.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-08 15:41:32 -08:00
Yong Tang
9e8adbecf5 Add custom DNS settings to service definition
This fix tries to fix the issue raised in 24391 about allowing
custom DNS settings to service definition.

This fix adds `DNSConfig` (`Nameservers`, `Options`, `Search`) to
service definition, as well as `--dns`, `--dns-opt`, and `dns-search`
to `service create`.

An integration test has been added to cover the changes in this fix.

This fix fixes 24391.

A PR in swarmkit will be created separately.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-08 15:41:32 -08:00
Sebastiaan van Stijn
703dcbe579 Merge pull request #28175 from Microsoft/jjh/hcsshim0.5.6
Revendor Microsoft/HCSShim v0.5.7
2016-11-09 00:37:13 +01:00
Tibor Vass
c33fb1013d Merge pull request #28142 from vieux/plugin_install_args
support settings in docker plugins install
2016-11-08 15:05:39 -08:00
Aaron Lehmann
0ccbae0437 Merge pull request #27123 from tonistiigi/fix-join-reconnect
Don’t attempt to reconnect swarm on failed join after timeout
2016-11-08 14:53:44 -08:00
Alexander Morozov
ff41cecc17 Merge pull request #28167 from mlaventure/update-containerd
Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531
2016-11-08 14:25:16 -08:00
Vincent Demeester
4c6db5d9cb Merge pull request #28170 from icecrime/poule_rebuild_all
poule: add `rebuild/*` to rebuild all at once
2016-11-08 22:37:33 +01:00
Victor Vieux
bbb645e84b Merge pull request #28178 from Microsoft/jjh/limited-typo
Fix typo 'limitied' in error message
2016-11-08 13:36:03 -08:00
John Howard
27de9f6ece Fix typo limitied
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-08 13:06:24 -08:00
John Howard
8ae9160643 Revendor Microsoft/HCSShim v0.5.7
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-08 12:09:11 -08:00
Victor Vieux
fb9aca3128 Merge pull request #28147 from yongtang/27567-service-update-docs-plural-form
Change to plural forms for help output of `docker service update`
2016-11-08 11:14:40 -08:00
Victor Vieux
ffccf2cab9 Merge pull request #28166 from vdemeester/dont-use-pkg-integration-in-other-pkg
Remove use of pkg/integration in pkg/idtools
2016-11-08 10:43:45 -08:00
Silvan Jegen
d359daaa48 Clean up journald logger
We clean up the journald logger with these four changes.

1. Make field array static
2. Make function name more appropriate
3. Initialize the file descriptors only once
4. Avoid copying the journald cursor

Point 4 is the most significant change: instead of treating the journald
cursor like a Go string we use it as a raw C.char pointer. That way we
avoid the copying by the C.CString and C.GoString functions.

Signed-off-by: Silvan Jegen <s.jegen@gmail.com>
2016-11-08 19:09:59 +01:00
Tonis Tiigi
ee9d28bd3f Don’t warn on missing fifo
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-08 09:59:49 -08:00
Kenfe-Mickael Laventure
0aa17f0f60 Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531
This version:
 - properly follow context cancellation on Start and Exec
 - add support for Solaris
 - ensure exec exit events are always seen before init's

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-08 09:47:41 -08:00
Vincent Demeester
a70b1d74a0 Merge pull request #27710 from allencloud/show-num-for-global-service-in-service-ls
support show numbers of global service in service ls command
2016-11-08 18:43:53 +01:00
Arnaud Porterie (icecrime)
3d89d694ea
poule: add rebuild/* to rebuild all at once
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-11-08 09:42:09 -08:00
Brian Goff
16ea0806f8 Merge pull request #28140 from tonistiigi/update-fifo
vendor: update fifo to 14056439
2016-11-08 12:31:03 -05:00
Sebastiaan van Stijn
9a61bd05f8 Merge pull request #27466 from mrjana/net
Retry AttachNetwork when it fails to find network
2016-11-08 18:25:45 +01:00
Vincent Demeester
acf7ce1aa0
Remove use of pkg/integration in pkg/idtools
This remove a dependency on `go-check` (and more) when using
`pkg/idtools`. `pkg/integration` should never be called from any other
package then `integration`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-08 17:21:02 +01:00
Justin Cormack
3a5a0ef1d4 Merge pull request #28130 from tophj-ibm/change-jq-syntax-for-old-version-support
[integration-cli] changes syntax to support older version of jq
2016-11-08 14:00:59 +00:00
Brian Goff
8a396f90f5 Merge pull request #28152 from AkihiroSuda/fix-tmpfs-ro-mount
api: fix ReadOnly support for tmpfs
2016-11-08 08:59:48 -05:00
Yong Tang
1b42d9d0db Change to plural forms for help output of docker service update
This fix is based on the comment in
https://github.com/docker/docker/pull/27567#discussion_r86910604

Basically, in the help output of `docker service update`, the `--xxx-add`
flags typically have plural forms while `--xxx-rm` flags have singular
forms.

This fix updates the help output for consistency.

This fix also updates the related docs in `service_update.md`.
The help output in `service_update.md` has been quite out-of-sync
with the actual output so this fix replaces the output with the
most up-to-date output.

This fix is related to #27567.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-08 05:53:56 -08:00
Akihiro Suda
189727581b Merge pull request #28158 from lixiaobing10051267/masterMakeSum
fix using wrong function name for MakeTarSumContext
2016-11-08 22:37:23 +09:00
Akihiro Suda
cbc511720a Merge pull request #28157 from yuexiao-wang/update-checkpoint
Update for docker checkpoint
2016-11-08 22:36:22 +09:00
Victor Vieux
e98e4a7111 always add but hide experimental cmds and flags
Signed-off-by: Victor Vieux <vieux@docker.com>

update cobra and use Tags

Signed-off-by: Victor Vieux <vieux@docker.com>

allow client to talk to an older server

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-08 04:55:27 -08:00
Sebastiaan van Stijn
14a06cbb29 Merge pull request #28143 from icecrime/poule
Add poule.yml
2016-11-08 13:09:09 +01:00
Vincent Demeester
ec22164358 Merge pull request #28153 from YuPengZTE/devCtx
context.Context should be the first parameter of a function
2016-11-08 12:40:32 +01:00
Vincent Demeester
2fa63c90de Merge pull request #28144 from yongtang/11072016-swarmkit-update
Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
2016-11-08 12:39:03 +01:00
Victor Vieux
586b7cc19e delete plugin rootfs on plugin rm
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-08 03:30:37 -08:00
Vincent Demeester
d46c7109b5 Merge pull request #27888 from sdurrheimer/zsh-completion-container-subcommand
Add zsh completion for new 'docker container' subcommands
2016-11-08 11:24:28 +01:00
Vincent Demeester
9075aa4ddd Merge pull request #28038 from bfirsh/add-validate-swagger
Validation for swagger.yaml
2016-11-08 10:57:01 +01:00
lixiaobing10051267
71f144648a fix using wrong function name for MakeTarSumContext
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-08 17:16:13 +08:00
yuexiao-wang
90ce77e46a Update for docker checkpoint
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-08 16:56:29 +08:00
Sebastiaan van Stijn
f5283bd253 Merge pull request #28117 from ping035627/ping035627-patch-1107
Modify to improve code readability
2016-11-08 09:44:45 +01:00
Sebastiaan van Stijn
c48c44371b Merge pull request #28156 from albers/completion-service-create--tty
Add bash completion for `docker service {create,update} --tty`
2016-11-08 09:35:17 +01:00
allencloud
ea03f090b8 support show numbers of global service in service ls command
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-08 16:17:15 +08:00
Harald Albers
bfd8f7a7e1 Add bash completion for docker service {create,update} --tty
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-08 09:13:23 +01:00
yupeng
4b86bd050b context.Context should be the first parameter of a function
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-08 14:51:17 +08:00
Victor Vieux
69276fddf8 support settings in docker plugins install
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-07 22:49:22 -08:00