Commit graph

25237 commits

Author SHA1 Message Date
tomwbarlow@gmail.com
eed8d14ed1 Change log.printf service creation msg to debug
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com>
2016-06-17 15:03:11 +01:00
Harald Albers
42f3b1f4ad fix bash completion for docker service subcommands
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-17 09:49:46 +02:00
Ke Xu
bd1fc1e5c2 fix #23017, add zsh completion for dockerd
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2016-06-17 16:16:13 +09:00
Harald Albers
dc2fc75d42 bash completion for docker swarm update --cert-expiry
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-17 08:49:06 +02:00
Sebastiaan van Stijn
8f9c7fab24 Merge pull request #23656 from sfsmithcha/check_cmd_line
update output for node commands, minor edits
2016-06-16 22:54:28 -07:00
Charles Smith
3b2132c2c7 update output for node commands, minor edits
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-16 21:44:07 -07:00
Neil Peterson
8352089e8c Added daemon.json Windows example
Signed-off-by: Neil Peterson <neilpeterson@outlook.com>
2016-06-16 21:41:58 -07:00
Tibor Vass
a3795ca13e Merge pull request #23652 from dnephin/better-bundle-load-errors
Improve the error messages for loading a bundle
2016-06-16 21:40:30 -07:00
Arnaud Porterie
4c5f1a7e5b Merge pull request #23647 from vieux/improve_messages_node_cmds
improve some messages in the node subcmds
2016-06-17 03:20:30 +00:00
Arnaud Porterie
f52c807650 Merge pull request #23651 from tonistiigi/cert-expiry
Add cert-expiry to swarm update
2016-06-17 02:50:58 +00:00
Tonis Tiigi
a933ac3c27 Add integration test for parsing swarm update options
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 19:50:01 -07:00
Tibor Vass
a590a6b180 Merge pull request #23532 from swernli/exitCodeFix
Fixing exit code return on error case in Windows.
2016-06-16 19:01:18 -07:00
Tibor Vass
f522ed9752 Merge pull request #23580 from cpuguy83/plugin_restore
Fix removing plugins and Implement plugin restore after daemon restart
2016-06-16 18:54:57 -07:00
Victor Vieux
eb962235fb improve some messages in the node subcmds
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-16 18:53:24 -07:00
Arnaud Porterie
f4de3f314e Merge pull request #23644 from tonistiigi/fix-leave-delete
Fix removing containers on leaving from pending state
2016-06-17 01:40:45 +00:00
Arnaud Porterie
edfd546a6f Merge pull request #23637 from vieux/add_more_fields_inspect
add some more fields in docker service inspect -p
2016-06-17 01:40:26 +00:00
Arnaud Porterie
0ef720eded Merge pull request #23643 from tonistiigi/membership
Return membership status on join without timeout
2016-06-17 01:40:06 +00:00
Tonis Tiigi
7d8d51aa9d Add cert-expiry to swarm update
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 18:06:02 -07:00
Arnaud Porterie
16a6987a00 Merge pull request #23549 from dmcgowan/reference-ui-updates
Do not show empty tags for digest references in output
2016-06-17 00:47:49 +00:00
Stefan J. Wernli
176345435b Fixing bug in AttachStreams that would fail to close StdIn
During a docker exec, if no TTY is specified, the code would still leave stdin open instead of closing it. This change adds handling for the execConfig TTY bool that mirrors what is already done for container config. (Updated this change to be Windows only.)

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-06-16 17:34:45 -07:00
Arnaud Porterie
6d9d149f99 Merge pull request #23648 from thaJeztah/fix-overlay-overlay2
fix "overlay" -> "overlay2" in error message
2016-06-17 00:21:53 +00:00
Arnaud Porterie
7ef9aec90f Merge pull request #23570 from vdemeester/change-plugin-install
Update docker plugin install code…
2016-06-17 00:12:56 +00:00
Sebastiaan van Stijn
314d9dc03a Merge pull request #23646 from thaJeztah/update-docker-info
Update docker info output example
2016-06-16 16:45:44 -07:00
Sebastiaan van Stijn
2d4b285a75
fix "overlay" -> "overlay2" in error message
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-16 16:42:40 -07:00
Sebastiaan van Stijn
07e1c62bf4
Update docker info output example
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-16 16:29:23 -07:00
Victor Vieux
4c9e21b674 add some more fields in docker service inspect -p
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-16 16:22:11 -07:00
Michael Crosby
eb6cc31802 Merge pull request #23639 from mavenugo/ln-rc2
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
2016-06-16 16:17:07 -07:00
Tonis Tiigi
826f6f0703 Fix removing containers on leaving from pending state
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 16:08:15 -07:00
Vincent Demeester
4a70cb5571
Update ServiceInspectWithRaw
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-17 00:47:22 +02:00
Michael Crosby
2fa38a9144 Merge pull request #23641 from justincormack/s390seccomp
Add the seccomp build tag for s390x now runc updated
2016-06-16 15:46:14 -07:00
Vincent Demeester
2c82337b04
Update docker plugin install code…
… for more consistency (api side).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-17 00:33:21 +02:00
Vincent Demeester
58529a1553
Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-17 00:32:58 +02:00
Tonis Tiigi
1973cee0cd Return membership status on join without timeout
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 15:27:08 -07:00
Michael Crosby
74c4834d32 Merge pull request #23624 from coolljt0725/fix_restore_sandbox
check running again before restore active sandbox
2016-06-16 15:24:58 -07:00
Justin Cormack
f8d970169a Add the seccomp build tag for s390x now runc updated
This was waiting for runc bump see https://github.com/docker/docker/issues/23171
runc was bumped in https://github.com/docker/docker/pull/23603

Fixes #23171

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-06-16 23:21:08 +01:00
Daniel Nephin
c0ea589c1b Add some tests for bundlefile and improve the error messages for LoadFile
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-16 18:18:25 -04:00
Tibor Vass
6b4e2ad90b Merge pull request #23520 from yongtang/23500-docker-info-security
Add security info to `docker info`
2016-06-16 15:15:33 -07:00
Tibor Vass
6dc58a1d58 Merge pull request #23640 from stevvooe/update-not-upate
api/client/service: fix minor spelling error in service inspect
2016-06-16 15:12:47 -07:00
Tibor Vass
06da8ce285 Merge pull request #23515 from HackToday/fixoverlay2
Add ecryptfs check for overlay2
2016-06-16 15:12:09 -07:00
Tonis Tiigi
a83bba467a Update daemon to new swarmkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 15:06:27 -07:00
Tonis Tiigi
2783568284 Update swarmkit to 310f1119
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 15:06:27 -07:00
Sebastiaan van Stijn
ef9c058b67 Merge pull request #23633 from thaJeztah/fix-advisory-meta
docs: move "advisory" to  general metadata
2016-06-16 14:55:11 -07:00
Stephen J Day
920e65ccbc
api/client/service: fix minor spelling error in service inspect
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-06-16 14:54:41 -07:00
Victor Vieux
348a7c790c Merge pull request #23537 from tiffanyfj/update-cli
Capitalized Docker and Swarm for consistency
2016-06-16 14:43:15 -07:00
Madhu Venugopal
262081557b Merge pull request #23635 from sainath14/network_id_missing
Fixes #23596-returns empty string for NetworkID
2016-06-16 14:38:51 -07:00
Tõnis Tiigi
70c7328d9e Merge pull request #23613 from stevvooe/running-over-replicas
api/client/service: list running services over replicas
2016-06-16 14:34:13 -07:00
Madhu Venugopal
7f2f6ed0d6 Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-16 14:33:36 -07:00
Tõnis Tiigi
6577031787 Merge pull request #23606 from vieux/fix_secrets
fix docker swarm init/update --secret
2016-06-16 14:24:35 -07:00
Tibor Vass
5d62f642d9 Merge pull request #23636 from crosbymichael/hang
Set systemd KillMode
2016-06-16 14:17:29 -07:00
Sebastiaan van Stijn
312749435b Merge pull request #23634 from thaJeztah/fix-api-menu-order
Fix API 1.25 order in menu
2016-06-16 13:31:32 -07:00