Commit graph

26564 commits

Author SHA1 Message Date
Zhang Wei
4df77c11e0 bugfix: report "destroy" after all volumes of container destroy
fixes #25766

If a container's AutoRemove is enabled, client will wait until it's
removed after container exits, this is implemented based on "destroy"
event.

Currently an "AutoRemove" container will report "destroy" event to
notify a hanging client to exit before all volumes are removed, this is
wrong, we should wait container until everything is cleaned up.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-17 11:02:16 +08:00
John Howard
3c6f4cd5a6 Merge pull request #25143 from cpuguy83/update_go-check
Add stack dumps from the daemon(s) on test timeout
2016-08-15 22:09:20 -07:00
Tõnis Tiigi
f5ef498289 Merge pull request #25597 from vieux/check_plugin_manifest_json
check plugin manifest is correctly formatted before push
2016-08-15 19:27:50 -07:00
Victor Vieux
b47711ae92 check plugin manifest is correctly formatted before push
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-15 17:51:30 -07:00
Tõnis Tiigi
70f843f7ae Merge pull request #25723 from anusha-ragunathan/plugin-force-rm
When handling plugin exit, lookup plugins only during daemon shutdown.
2016-08-15 16:30:37 -07:00
Michael Crosby
c67cc60713 Merge pull request #25676 from tiborvass/fix-rpm-release-script
release-rpm: fix bad destination paths for rpms
2016-08-15 16:23:25 -07:00
Anusha Ragunathan
57499fa62e When handling plugin exit, lookup plugins only during daemon shutdown.
The main intent of handling plugin exit is for graceful shutdown
of plugins during daemon shutdown. So avoid plugin lookup during
plugin exits caused by other reasons (eg. force remove)

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-08-15 14:46:02 -07:00
Tõnis Tiigi
90be7a591d Merge pull request #25482 from yuexiao-wang/close_pipe
Close pipe after using pipe
2016-08-15 13:02:59 -07:00
Sebastiaan van Stijn
9079d5ccbb Merge pull request #25706 from thaJeztah/add-authorization-header-to-api-docs
Add X-Registry-Auth header to service API docs
2016-08-15 21:54:06 +02:00
Vincent Demeester
a5809ddd2a Merge pull request #25715 from thaJeztah/update-changelog-for-userland-proxy-binary
Add note about new binaries to changelog
2016-08-15 21:48:21 +02:00
Sebastiaan van Stijn
4105cff4d8 Merge pull request #25707 from thaJeztah/move-sysctls-to-correct-api-version
Move sysctls to correct API version
2016-08-15 20:29:51 +02:00
Sebastiaan van Stijn
0f838cc523 Merge pull request #25710 from thaJeztah/restore-missing-ps-example
Restore missing ps example for killed containers
2016-08-15 16:02:16 +02:00
Brian Goff
bfc3f121f1 Merge pull request #25700 from lixiaobing10051267/masterSwarmRmService
command "docker service remove" not consistent
2016-08-15 09:55:52 -04:00
Sebastiaan van Stijn
2806b3b6c7 Merge pull request #25712 from thaJeztah/carry-25613-fix-capitalization
Fix capitalization
2016-08-15 15:53:36 +02:00
Sebastiaan van Stijn
32b8a6e735
Add note about new binaries to changelog
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-15 15:23:14 +02:00
Sebastiaan van Stijn
75e60fbe09
Fix capitalization
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-15 14:14:41 +02:00
Sebastiaan van Stijn
8d5818a693
Restore missing ps example for killed containers
This example was added in b0b2f979c7,
but got lost during splitting up the cli.md docs into separate files;
561bfb268d

This restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-15 13:41:18 +02:00
Sebastiaan van Stijn
7cdd693d5d
Move sysctls to correct API version
Commit 067b510dfc move the
sysctls feature to the right API version, but
missed this one.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-15 12:02:54 +02:00
Sebastiaan van Stijn
bde35ef18a
Add X-Registry-Auth header to service API docs
The service create/update endpoints support
passing registry-authentication information,
but this was not documented.

This adds the missing information about passing
a X-Registry-Auth header.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-15 11:53:12 +02:00
lixiaobing10051267
078e2aa157 command "docker service remove" not insistant
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-15 15:11:37 +08:00
Tõnis Tiigi
5ac0342e82 Merge pull request #25675 from DieterReuter/master
Fix build deb for ARMv6
2016-08-13 10:16:29 -07:00
Sebastiaan van Stijn
856fa571d0 Merge pull request #25678 from tonistiigi/clear-wal
Clear raft state file after every test
2016-08-13 17:44:56 +02:00
Vincent Demeester
28c20592b6 Merge pull request #25677 from friism/tweak-logout-message
tweak logout message
2016-08-13 09:37:56 +02:00
Vincent Demeester
7fddf51aa4 Merge pull request #25673 from SvenDowideit/remove-dead-link
James' site has been dead for a while - removing links
2016-08-13 09:35:04 +02:00
Tonis Tiigi
34f779dbc3 Clear raft state file after every test
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-12 17:30:37 -07:00
Michael Friis
f9443aa2a5 tweak logout message
Signed-off-by: Michael Friis <friism@gmail.com>
2016-08-12 17:00:06 -07:00
Tibor Vass
e1c7ad871f release-rpm: fix bad destination paths for rpms
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-12 16:51:12 -07:00
Michael Crosby
2faeebc750 Merge pull request #24311 from ShevYan/incorrect-comments-in-dockerfile
Dockerfile's comments for "Run the test suite" are out of date becaus…
2016-08-12 15:53:06 -07:00
Dieter Reuter
5907e4a872 Fix build deb for ARMv6
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2016-08-13 00:40:29 +02:00
Michael Crosby
05d1dcfca2 Merge pull request #23116 from glensc/mkimage-pld
add script to make base image for PLD Linux
2016-08-12 15:38:36 -07:00
Charles Smith
84ef31a79c Merge pull request #25420 from sfsmithcha/add_networking_guide
per @mavenugo , merging after addressing comments
add overlay networking guide
2016-08-12 15:29:34 -07:00
Charles Smith
e56dd0e0e7 add overlay networking guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-12 15:18:21 -07:00
Michael Crosby
2a10899c16 Merge pull request #25216 from aanand/deploy-error-when-not-in-swarm-mode
Better error on 'docker deploy' when not in Swarm mode
2016-08-12 14:17:47 -07:00
Sven Dowideit
a9b08f3102 James' site has been dead for a while - removing links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-08-12 21:16:57 +00:00
Charles Smith
ccf3dd85f0 Merge pull request #25135 from sfsmithcha/add_overlay_networking_note
per @mavenugo , merging after addressing his comments:
add swarm mode overlay networking security model
2016-08-12 13:25:07 -07:00
Charles Smith
cc5debcb2e add overlay networking security model node
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-12 13:17:24 -07:00
Brian Goff
838db8852c Merge pull request #25669 from dlech/patch-2
Move export from image commands to container commands
2016-08-12 15:52:07 -04:00
Brian Goff
c6e3818dd1 Merge pull request #24814 from samuelkarp/awslogs
awslogs: Record log line insert order for sorting
2016-08-12 15:51:06 -04:00
Michael Crosby
5632768a0f Merge pull request #22208 from msabansal/staticip
Enabling specifying static ip for predefined network on windows
2016-08-12 11:39:25 -07:00
Michael Crosby
2c50035f93 Merge pull request #24717 from icaoweiwei/patch_2016-07-16_1
Add output of integer argument
2016-08-12 10:54:01 -07:00
Michael Crosby
5dbdc321dc Merge pull request #25657 from thaJeztah/update-image-load-api-docs
Update API docs example for image load response
2016-08-12 10:29:01 -07:00
Michael Crosby
a86b2376a0 Merge pull request #25070 from yongtang/24881-label-containers-with-stack-name
Label containers with stack name when deploying stack/bundle
2016-08-12 10:20:06 -07:00
David Lechner
43c8cc7bb4 Move export from image commands to container commands
The export command operates on containers, not images, so it should be listed under the container commands, not the image commands.

Signed-off-by: David Lechner <david@lechnology.com>
2016-08-12 12:15:32 -05:00
Tõnis Tiigi
f4646196b6 Merge pull request #25668 from LK4D4/remove_rewrite
hack/vendor.sh: remove old hacks for etcd
2016-08-12 10:12:50 -07:00
Brian Goff
b0431d63dc Merge pull request #25635 from dperny/rate-limit-swarm-pull-log
Rate limit logspam during docker service pulls
2016-08-12 13:06:39 -04:00
Tõnis Tiigi
b08a1c3fe4 Merge pull request #25660 from justincormack/no-fuse-dev
Do not create /dev/fuse by default
2016-08-12 10:05:16 -07:00
Michael Crosby
be045ee2da Merge pull request #25628 from cpuguy83/carry_21567_filter_vol_by_label
Carry 21567 filter vol by label
2016-08-12 09:43:45 -07:00
Michael Crosby
34cc19f670 Merge pull request #25509 from Microsoft/jjh/23079
Windows: Block ReFS file systems
2016-08-12 09:32:22 -07:00
Alexander Morozov
6623a5342c hack/vendor.sh: remove old hacks for etcd
etcd uses standard vendoring now

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-08-12 08:50:52 -07:00
Vincent Demeester
64f83cee43 Merge pull request #25568 from thaJeztah/enhance-string-truncate
Implement stringutils.Ellipsis()
2016-08-12 17:19:50 +02:00