a6c4715a80
Merge pull request #24141 from thaJeztah/add-charles-as-docs-maintainer
...
Add Charles to docs maintainers
Upstream-commit: 511002f3080a3a52c0e75a193799700622a16124
Component: engine
2016-06-29 13:32:32 -07:00
d648d9a308
docs: add note that we no longer send container-id for exec
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 82876c0f5b41fe4e3ee33e0bc77f2560b1a6535f
Component: engine
2016-06-29 13:30:09 -07:00
cddb6e635c
Updating header name and executor
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: af5df117a805c8df661c7efa58c57680019b5752
Component: engine
2016-06-29 13:26:19 -07:00
429f89b0c8
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 >
Upstream-commit: b4163c1189c7389ddda32d9c4ec57708690434c8
Component: engine
2016-06-29 13:13:57 -07:00
6e93db8e82
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)
Upstream-commit: 1cd74902810b0eefddd173239cd95b506b34e678
Component: engine
2016-06-29 13:09:13 -07:00
beffe0658c
Fix mount opts error message.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c8659d3cc501449a69a7e0b79994b42799750f29
Component: engine
2016-06-29 15:14:55 -04:00
d4e14be148
Merge pull request #23955 from yongtang/23768-cpu-count
...
Fix wrong CPU count after CPU hot-plugging
Upstream-commit: 50a173e3d5ca8ed3b52c53fde6729188fc02e9e7
Component: engine
2016-06-29 12:00:13 -07:00
8a1b995558
Merge pull request #23946 from dnephin/service-update-args
...
Fixes for `service update` of Args
Upstream-commit: 1e7ba55494eff0f38aa503b81576519b7b383644
Component: engine
2016-06-29 20:24:07 +02:00
1535d36be1
Merge pull request #24071 from vdemeester/24063-empty-filtered-network-list
...
Return an empty network list if nothing matches filter
Upstream-commit: 27ceac2d74df385119fea2606a287d91a4123d82
Component: engine
2016-06-29 11:14:30 -07:00
ec650aece5
Merge pull request #24028 from hqhq/fix_comments_in_aarch64
...
Fix comments in Dockerfile.aarch64
Upstream-commit: ccab57620e9b007a6fa4d462790fad004b62f9b2
Component: engine
2016-06-29 11:06:29 -07:00
8de57b9a7b
Merge pull request #24069 from adamjk-dev/install_script_rhel_fix
...
Install script rhel fix
Upstream-commit: b9fc4ed664a8d504576af6e45a11dd55acd0a104
Component: engine
2016-06-29 11:04:55 -07:00
5bc8520da4
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 >
Upstream-commit: 485c27e18680f5eaeefe5de7f7916ba23f66c8f0
Component: engine
2016-06-29 13:51:27 -04:00
defc31809a
Merge pull request #24105 from vdemeester/24094-fix-swarm-join-doc
...
Fixes /swarm/join endpoint documentation
Upstream-commit: d68415a949f4ba62d0929ebc53825fbab6ff1e36
Component: engine
2016-06-29 10:48:41 -07:00
7dfc0b0c86
Merge pull request #24050 from ncoolz/issue-cluster-store-config
...
Fix check code for --cluster-store and --cluster-advertise in config_…
Upstream-commit: 2f9d20288c7b1ebf6f0a9888e6af9b5262d49484
Component: engine
2016-06-29 19:15:23 +02:00
943b955f19
Fix service update of Args
...
add a unit test
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 07b59ef210490df19f65da950d7d41176d104a31
Component: engine
2016-06-29 12:41:57 -04:00
596823812f
Merge pull request #24126 from noxiouz/fix_doc_api
...
Remove extra comma in Image Pull API examples
Upstream-commit: e51fc722388431eeb2a94ab224d9d8636df85a97
Component: engine
2016-06-29 18:16:04 +02:00
6a75e770e4
Merge pull request #24120 from albers/docs-filter-desired_state
...
add documentation for `desired_state` filter
Upstream-commit: aa4d9c1a46b37b6135668fdcb3d24c5a3e54b4b6
Component: engine
2016-06-29 09:15:11 -07:00
d906df91ca
Remove extra comma in Image Pull API examples
...
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: 307c39c187f8785d8edae4bfd460e2dd0432626a
Component: engine
2016-06-29 19:04:42 +03:00
a758d1d64d
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 >
Upstream-commit: 3c194bd2a4fb4693deba366b3400c2efeeb90369
Component: engine
2016-06-29 17:40:34 +02:00
e14d2bc523
add documentation for desired_state filter
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 36f57f7d024e44b1db7f5cd0c24526f4cdfb7234
Component: engine
2016-06-29 08:27:25 -07:00
edd4ca39cd
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 >
Upstream-commit: 97c9491b0d395dc923e8b4e335839662c17aff46
Component: engine
2016-06-29 11:27:22 +02:00
c6d459baa5
Revert tasksmax workaround to avoid unsupported bins
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 6509cc4e63f50661f6563f45153b23599cc6665c
Component: engine
2016-06-29 08:10:10 +02:00
f1627bde25
Merge pull request #24072 from anusha-ragunathan/fix-tests
...
Fix daemon tests.
Upstream-commit: 3d231c78e8c57acc31ca4294c73c0d02c9a5ca12
Component: engine
2016-06-29 07:52:21 +02:00
f2f73c4b53
Merge pull request #24096 from sfsmithcha/fix_footers
...
remove margin from bottom of swarm mode docs
Upstream-commit: 91fd0df9c0775dc48446c924c4789c81b4f5f47e
Component: engine
2016-06-28 21:44:49 -07:00
0e7c9136da
remove margin from bottom of swarm mode docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 0d6f59e85a2728008aad154d366cc8c92888e871
Component: engine
2016-06-28 19:46:39 -07:00
ed5060064e
zfs: call mount.MakePrivate
...
Fix #24008
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 5ec8441bb55ecbf83da6407a4135ce83b1fe01c7
Component: engine
2016-06-29 01:55:45 +00:00
c760355112
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 >
Upstream-commit: 6d36431e2395867d7bb101dbfd4340e132fd5438
Component: engine
2016-06-28 15:29:49 -07:00
4850c6643f
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 >
Upstream-commit: a7043ac5c423cf68d4f92024e694887099640d91
Component: engine
2016-06-29 00:06:44 +02:00
217e2bc779
Merge pull request #24061 from dmcgowan/close-reader-after-mount-exec
...
overlay2: close read end of pipe on mount exec
Upstream-commit: 57977fb1273337db0e5da46faf4068c4073aa0bb
Component: engine
2016-06-28 14:58:56 -07:00
23c9812d15
Merge branch 'master' into issue-cluster-store-config
...
Upstream-commit: 679fe7e36a07ff0058b780b99fb9432cd2fb68f4
Component: engine
2016-06-29 06:25:34 +09:00
0660142527
Add integration tests for swarm incompatible
...
Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com >
Upstream-commit: d71789828f5c8d2e0f5757f1c003325c4b8a871d
Component: engine
2016-06-29 06:21:02 +09:00
966b245d6f
Update engine-api vendored version
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: e13a14340dde563fa799fb95090940c74636e398
Component: engine
2016-06-28 13:53:01 -07:00
b75c9d3100
Passing registry auth token for service create and update
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 93ec5cda55e78dbb683b59bde244a7984b323574
Component: engine
2016-06-28 13:53:01 -07:00
be8ea5149d
Merge pull request #24047 from cpuguy83/add_ipvs_to_check
...
Add ip_vs to check-config script
Upstream-commit: f529af010744b305fd719833b157587a2bf55862
Component: engine
2016-06-28 13:34:43 -07:00
860c6cce0c
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)
Upstream-commit: ad4b3e11fe41080d66ac1780b455246ae18bdc35
Component: engine
2016-06-28 13:23:00 -07:00
e89f357b69
Windows: Skip RunCidFileCleanupIfEmpty on RS1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 20424fccdd1ba874277eca7d9644b1ef98ac4b2e
Component: engine
2016-06-28 13:04:42 -07:00
cf2790c1e0
Windows: Skip TestBuildEmptyCmd on RS1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 45da1274421ba7484dcf2bf1a398f9e3683600d1
Component: engine
2016-06-28 12:22:16 -07:00
9d3ea6e1c5
Add ip_vs to check-config script
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9e14002cedd21d6eedd86ea2a536f1137f88921d
Component: engine
2016-06-28 13:42:38 -04:00
12a56855f7
Fix check code for --cluster-store and --cluster-advertise in config_unix.go
...
Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com >
Upstream-commit: 4f671ae85e62d0b413f913b1289100ae7cc45972
Component: engine
2016-06-29 02:36:43 +09:00
c9e0f2fc4f
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 >
Upstream-commit: fd1129d31a4e1981da2b25e165a46bcc7a042725
Component: engine
2016-06-28 10:05:05 -07:00
f710718938
Merge pull request #24025 from AkihiroSuda/fixzfsdoc
...
update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS
Upstream-commit: 83e6197380149f2d8f1ca82b57f044dfcccc3ce2
Component: engine
2016-06-28 10:05:44 -04:00
f717459df7
Merge pull request #24032 from feldan/24030-malformed_history_layer
...
Fix Malformed history layer - missing Sprintf
Upstream-commit: e7e9b183fd359dbc64f3a5a22e44c65fc32925fe
Component: engine
2016-06-28 13:37:49 +02:00
9de77e3319
Fix Malformed history layer - missing Sprintf in append of shell in Builder run config
...
Signed-off-by: Dan Feldman <danf@jfrog.com >
Upstream-commit: 29b6a696604d5bc80d1722e3ba123558bce7c7c9
Component: engine
2016-06-28 11:09:39 +03:00
f8d5f385a9
Fix comments in Dockerfile.aarch64
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 1997081096b9713bf2b79f7b5d8077daddf6e04e
Component: engine
2016-06-28 14:31:34 +08:00
28815bb149
update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: ddf9b6f6666d501bc408bdf8cdc4feb10db287ed
Component: engine
2016-06-28 06:11:03 +00:00
e2a613180b
Merge pull request #24021 from londoncalling/add-redirect-for-getting-started
...
added another alias for getting started stuff
Upstream-commit: 2875c5404e87f63d64986fee5f68d31a83f075c8
Component: engine
2016-06-27 23:01:09 -07:00
0a733da91c
added another alias for getting started stuff
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 4060eb02ef84a0faef4407bf9796db1a2afc42f5
Component: engine
2016-06-27 18:58:16 -07:00
a556d4c8c6
Merge pull request #23950 from jstarks/no_clone_tp5
...
Windows: Disable VM cloning for TP5 image
Upstream-commit: 1c06ebeeee1a600c0e4fc73d3c7485e5d15abfda
Component: engine
2016-06-27 15:13:50 -07:00
3fd6864743
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 >
Upstream-commit: 378f0657f963fa6c854643571e4fe83628466c01
Component: engine
2016-06-27 14:14:23 -07:00
3aaad04eea
Merge pull request #23182 from crosbymichael/maxkeys
...
Change root_maxkeys
Upstream-commit: 8e8ef7c724accb8d3038ff14ab878b24af8a6f03
Component: engine
2016-06-27 13:46:11 -07:00
