p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,404 Commits 2 Branches 295 Tags
24d57a19bbfee32f4f45880e481fb4b4fb704032
Commit Graph

25404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
allencloud
24d57a19bb fix comments and handle err 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: cc054f3195308da471c252d755dacfe446cb1066
Component: engine
 2016-06-30 21:53:20 +08:00
Vincent Demeester
c89614146c Merge pull request #24007 from LK4D4/fix_close_races 
daemon/logger: fix races in channel close
Upstream-commit: e8439971b42a65dd831f80ec76a38e8c8e938cb6
Component: engine
 2016-06-30 15:21:17 +02:00
Antonio Murdaca
cfcc34db47 Merge pull request #24164 from coolljt0725/remove_no_warn 
Remove dm.no_warn_on_loop_devices in info warning
Upstream-commit: e275865a61c2c776bb2b1673d05bc2f6a8d72042
Component: engine
 2016-06-30 15:16:05 +02:00
Vincent Demeester
660ae2c902 Merge pull request #24149 from mavenugo/kn 
Added missing flags for swarm-mode networks
Upstream-commit: cc024095c99edfec556bb2f5840279490fff4218
Component: engine
 2016-06-30 12:23:45 +02:00
Sebastiaan van Stijn
d4be296b2a Merge pull request #24080 from dmcgowan/atomic-writer-mode 
Set permission on atomic file write
Upstream-commit: cbf785c45a8cca061028ec341320bcbd655cf1fd
Component: engine
 2016-06-30 01:00:08 -07:00
Lei Jitang
ac805da5d2 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>
Upstream-commit: 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7
Component: engine
 2016-06-30 14:57:46 +08:00
Lei Jitang
ce55ac5368 Merge pull request #23974 from hopkings2008/devmapper_log 
Add detail error logs when 'Unknown Device' error happens if devicema…
Upstream-commit: d2da1e3997c0d199c08c652c1285025415517f8d
Component: engine
 2016-06-29 23:39:40 -07:00
yuzou
e667b026a1 Add detail error logs when 'Unknown Device' error happens if devicemapper storage is used. 
Signed-off-by: yuzou <zouyu7@huawei.com>
Upstream-commit: d4a2bcc9ac49d07c71822ce72b97861d5844b46d
Component: engine
 2016-06-30 13:06:14 +08:00
Madhu Venugopal
bd38c4db96 Added missing flags for swarm-mode networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: cf78863e9dc4e3480a7d1059ed306bdfd81cd3dc
Component: engine
 2016-06-29 15:30:57 -07:00
Sebastiaan van Stijn
5113884470 Merge pull request #24144 from thaJeztah/update-api-docs 
docs: add note that we no longer send container-id for exec
Upstream-commit: e904f58e199836fa43ee1c6736e689ef58e4fe10
Component: engine
 2016-06-29 15:25:43 -07:00
Brian Goff
cadc295e94 Merge pull request #24135 from dnephin/fix_error_message 
Fix mount opts error message
Upstream-commit: 55d9c49f920b4752337cee959cbc24b5d1b7ee5a
Component: engine
 2016-06-29 17:19:00 -04:00
Alexander Morozov
29d2889a79 Merge pull request #23789 from tonistiigi/swarm-integration-tests 
Update swarm integration tests and shutdown synchronization
Upstream-commit: 9162011680efa714788377651e51872bb852e2e3
Component: engine
 2016-06-29 14:09:57 -07:00
Sebastiaan van Stijn
967277989f Merge pull request #23949 from jstarks/fix_progress_on_load_compressed_layer 
image: Report load progress on compressed layer size
Upstream-commit: a1fff2ca5afa15ae092668a06b55ae2dc4e039d7
Component: engine
 2016-06-29 13:37:12 -07:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Derek McGowan
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
Daniel Nephin
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Adam Kunk
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Daniel Nephin
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Anton Tiurin
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
Harald Albers
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
Vincent Demeester
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Charles Smith
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
Anusha Ragunathan
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
Vincent Demeester
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
Alexander Morozov
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
Wonjun Kim
23c9812d15 Merge branch 'master' into issue-cluster-store-config 
Upstream-commit: 679fe7e36a07ff0058b780b99fb9432cd2fb68f4
Component: engine
 2016-06-29 06:25:34 +09:00
Wonjun Kim
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
Michael Crosby
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
Derek McGowan
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
Brian Goff
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
Wonjun Kim
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
Brian Goff
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
Vincent Demeester
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
danf
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
Qiang Huang
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
Akihiro Suda
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
Sebastiaan van Stijn
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