0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25603 commits 14 branches 412 tags 338 MiB
Commit graph

25603 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Kenfe-Mickael Laventure
fd1129d31a Prevent CI from getting stuck if shims are left alive 
This will kill any left over containerd-shims to avoid the integration
script to stay stuck while it waits on them.

It will then causes CI to fail (even if all the tests succeeded).

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-28 10:05:05 -07:00
Brian Goff
83e6197380 Merge pull request #24025 from AkihiroSuda/fixzfsdoc 
update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS
 2016-06-28 10:05:44 -04:00
Vincent Demeester
e7e9b183fd Merge pull request #24032 from feldan/24030-malformed_history_layer 
Fix Malformed history layer - missing Sprintf
 2016-06-28 13:37:49 +02:00
danf
29b6a69660 Fix Malformed history layer - missing Sprintf in append of shell in Builder run config 
Signed-off-by: Dan Feldman <danf@jfrog.com>
 2016-06-28 11:09:39 +03:00
Qiang Huang
1997081096 Fix comments in Dockerfile.aarch64 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-06-28 14:31:34 +08:00
Akihiro Suda
ddf9b6f666 update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-06-28 06:11:03 +00:00
Sebastiaan van Stijn
2875c5404e Merge pull request #24021 from londoncalling/add-redirect-for-getting-started 
added another alias for getting started stuff
 2016-06-27 23:01:09 -07:00
Victoria Bialas
4060eb02ef added another alias for getting started stuff 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-06-27 18:58:16 -07:00
Derek McGowan
9836162446 Atomically save libtrust key file 
The libtrust keyfile which is used to set the "ID" property of a daemon must be generated or loaded on every startup.
If the process crashes during startup this could cause the file to be incomplete causing future startup errors.
Ensure that the file is written atomically to ensure the file is never in an incomplete state.

Fixes #23985

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-06-27 15:54:39 -07:00
Sebastiaan van Stijn
1c06ebeeee Merge pull request #23950 from jstarks/no_clone_tp5 
Windows: Disable VM cloning for TP5 image
 2016-06-27 15:13:50 -07:00
Alexander Morozov
378f0657f9 daemon/logger: fix races in channel close 
it's actually not okay to do such trick from multiple goroutines

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-06-27 14:14:23 -07:00