Commit graph

25461 commits

Author SHA1 Message Date
Sebastiaan van Stijn
cbf785c45a Merge pull request #24080 from dmcgowan/atomic-writer-mode
Set permission on atomic file write
2016-06-30 01:00:08 -07:00
Lei Jitang
2aa01e0fbc Remove dm.no_warn_on_loop_devices in info warning
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-06-30 14:57:46 +08:00
Lei Jitang
d2da1e3997 Merge pull request #23974 from hopkings2008/devmapper_log
Add detail error logs when 'Unknown Device' error happens if devicema…
2016-06-29 23:39:40 -07:00
yuzou
d4a2bcc9ac Add detail error logs when 'Unknown Device' error happens if devicemapper storage is used.
Signed-off-by: yuzou <zouyu7@huawei.com>
2016-06-30 13:06:14 +08:00
Yong Tang
4bc91ceeb7 Use HOSTNAME in the output of docker node ls
This fix tries to address an issue raised in #24090 where
the title field of `docker node ls` use NAME instead of
HOSTNAME. Yet the content of this field is actually
hostname.

The fix makes needed changes for the output of
`docker node ls`.

An additional test has been added to cover the change in
this fix.

This fix fixes #24090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-29 19:54:16 -07:00
Tonis Tiigi
41bf7de73b Fix duplicate layers in exported tar
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-29 18:06:42 -07:00
Madhu Venugopal
cf78863e9d Added missing flags for swarm-mode networks
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-29 15:30:57 -07:00
Sebastiaan van Stijn
e904f58e19 Merge pull request #24144 from thaJeztah/update-api-docs
docs: add note that we no longer send container-id for exec
2016-06-29 15:25:43 -07:00
Brian Goff
55d9c49f92 Merge pull request #24135 from dnephin/fix_error_message
Fix mount opts error message
2016-06-29 17:19:00 -04:00
Alexander Morozov
9162011680 Merge pull request #23789 from tonistiigi/swarm-integration-tests
Update swarm integration tests and shutdown synchronization
2016-06-29 14:09:57 -07:00
Sebastiaan van Stijn
a1fff2ca5a Merge pull request #23949 from jstarks/fix_progress_on_load_compressed_layer
image: Report load progress on compressed layer size
2016-06-29 13:37:12 -07:00
Sebastiaan van Stijn
511002f308 Merge pull request #24141 from thaJeztah/add-charles-as-docs-maintainer
Add Charles to docs maintainers
2016-06-29 13:32:32 -07:00
Sebastiaan van Stijn
82876c0f5b
docs: add note that we no longer send container-id for exec
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-29 13:30:09 -07:00
Nishant Totla
af5df117a8
Updating header name and executor
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-29 13:26:19 -07:00
Sebastiaan van Stijn
b4163c1189
Add Charles to docs maintainers
Charles is part of the docs team, so
adding him to the list here.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-29 13:13:57 -07:00
Derek McGowan
1cd7490281 Set permission on atomic file write
Perform chmod before rename with the atomic file writer.
Ensure writeErr is set on short write and file is removed on write error.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-06-29 13:09:13 -07:00
Daniel Nephin
c8659d3cc5 Fix mount opts error message.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-29 15:14:55 -04:00
Sebastiaan van Stijn
50a173e3d5 Merge pull request #23955 from yongtang/23768-cpu-count
Fix wrong CPU count after CPU hot-plugging
2016-06-29 12:00:13 -07:00
Vincent Demeester
1e7ba55494 Merge pull request #23946 from dnephin/service-update-args
Fixes for `service update` of Args
2016-06-29 20:24:07 +02:00
Sebastiaan van Stijn
27ceac2d74 Merge pull request #24071 from vdemeester/24063-empty-filtered-network-list
Return an empty network list if nothing matches filter
2016-06-29 11:14:30 -07:00
Sebastiaan van Stijn
ccab57620e Merge pull request #24028 from hqhq/fix_comments_in_aarch64
Fix comments in Dockerfile.aarch64
2016-06-29 11:06:29 -07:00
Sebastiaan van Stijn
b9fc4ed664 Merge pull request #24069 from adamjk-dev/install_script_rhel_fix
Install script rhel fix
2016-06-29 11:04:55 -07:00
Adam Kunk
485c27e186 updates to fix install script for RHEL
fixing install script for rhel7

fixing install script for rhel7

Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org>

updates to fix install script for RHEL

fixing install script for rhel7

fixing install script for rhel7

Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org>
2016-06-29 13:51:27 -04:00
Sebastiaan van Stijn
d68415a949 Merge pull request #24105 from vdemeester/24094-fix-swarm-join-doc
Fixes /swarm/join endpoint documentation
2016-06-29 10:48:41 -07:00
Vincent Demeester
2f9d20288c Merge pull request #24050 from ncoolz/issue-cluster-store-config
Fix check code for --cluster-store and --cluster-advertise in config_…
2016-06-29 19:15:23 +02:00
Daniel Nephin
07b59ef210 Fix service update of Args
add a unit test

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-29 12:41:57 -04:00
Vincent Demeester
e51fc72238 Merge pull request #24126 from noxiouz/fix_doc_api
Remove extra comma in Image Pull API examples
2016-06-29 18:16:04 +02:00
Sebastiaan van Stijn
aa4d9c1a46 Merge pull request #24120 from albers/docs-filter-desired_state
add documentation for `desired_state` filter
2016-06-29 09:15:11 -07:00
Anton Tiurin
307c39c187
Remove extra comma in Image Pull API examples
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
2016-06-29 19:04:42 +03:00
Vincent Demeester
3c194bd2a4
Fix --filter=desired_state behaviour
Just like `docker service tasks`, we should add `desired_state` filters
only in case there is no provided filters.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-29 17:40:34 +02:00
Harald Albers
36f57f7d02 add documentation for desired_state filter
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-29 08:27:25 -07:00
Vincent Demeester
97c9491b0d
Fixes /swarm/join endpoint documentation
The JSON payload given in the API documentation is wrong, fixing it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-29 11:27:22 +02:00
Stefan Scherer
6509cc4e63
Revert tasksmax workaround to avoid unsupported bins
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-06-29 08:10:10 +02:00
Vincent Demeester
3d231c78e8 Merge pull request #24072 from anusha-ragunathan/fix-tests
Fix daemon tests.
2016-06-29 07:52:21 +02:00
Sebastiaan van Stijn
91fd0df9c0 Merge pull request #24096 from sfsmithcha/fix_footers
remove margin from bottom of swarm mode docs
2016-06-28 21:44:49 -07:00
Charles Smith
0d6f59e85a remove margin from bottom of swarm mode docs
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-28 19:46:39 -07:00
Akihiro Suda
5ec8441bb5 zfs: call mount.MakePrivate
Fix #24008

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-29 01:55:45 +00:00
Anusha Ragunathan
6d36431e23 Fix daemon tests.
Fix two test issues:
- pidof is not available in PATH on some Jenkins systems (rhel, centos)
  Use kill -0 instead.
- Cleanup after plugin test. This is a stop gap fix. The right way to
  fix this, is to shutdown the plugin on daemon shutdown path (except
  for the live-restore case). This will be done in a follow up PR.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-06-28 15:29:49 -07:00
Vincent Demeester
a7043ac5c4
Return an empty network list if nothing matches filter
Initializing the network list struct in order to return an empty list
instead of a nil object.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-29 00:06:44 +02:00
Alexander Morozov
57977fb127 Merge pull request #24061 from dmcgowan/close-reader-after-mount-exec
overlay2: close read end of pipe on mount exec
2016-06-28 14:58:56 -07:00
Wonjun Kim
679fe7e36a Merge branch 'master' into issue-cluster-store-config 2016-06-29 06:25:34 +09:00
Wonjun Kim
d71789828f Add integration tests for swarm incompatible
Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com>
2016-06-29 06:21:02 +09:00
Nishant Totla
e13a14340d
Update engine-api vendored version
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-28 13:53:01 -07:00
Nishant Totla
93ec5cda55
Passing registry auth token for service create and update
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-28 13:53:01 -07:00
Michael Crosby
f529af0107 Merge pull request #24047 from cpuguy83/add_ipvs_to_check
Add ip_vs to check-config script
2016-06-28 13:34:43 -07:00
Derek McGowan
ad4b3e11fe overlay2: close read end of pipe on mount exec
Use StdinPipe to ensure pipe is properly closed after startup

Fixes #23686

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-06-28 13:23:00 -07:00
John Howard
20424fccdd Windows: Skip RunCidFileCleanupIfEmpty on RS1
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-06-28 13:04:42 -07:00
John Howard
45da127442 Windows: Skip TestBuildEmptyCmd on RS1
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-06-28 12:22:16 -07:00
Brian Goff
9e14002ced Add ip_vs to check-config script
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-28 13:42:38 -04:00
Wonjun Kim
4f671ae85e Fix check code for --cluster-store and --cluster-advertise in config_unix.go
Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com>
2016-06-29 02:36:43 +09:00