toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,763 Commits 3 Branches 295 Tags
da0e87ebb95b43a2a478c4c8bd6a74d7099b2a1f
Commit Graph

12763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessie Frazelle
da0e87ebb9 Merge pull request #10288 from tiborvass/fix-test-attach 
integration-cli: wait for container before sending ^D
Upstream-commit: 54ddb9b41d550fea021efb9f77b7993acf3d6f75
Component: engine
 2015-01-22 15:07:46 -08:00
Tibor Vass
551d8c12b8 integration-cli: wait for container before sending ^D 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: a124bfaef37a9d209de881325dbe653d9b07ef4d
Component: engine
 2015-01-22 17:28:35 -05:00
Arnaud Porterie
a5a927b102 Merge pull request #10282 from tiborvass/fix-test-restart-policy-always 
integration-cli: Fix race in restart loop
Upstream-commit: 5a6f84ce089f7a562010564ad7e2ebcb60a39d5d
Component: engine
 2015-01-22 13:17:23 -08:00
Arnaud Porterie
7a156f1702 Merge pull request #10234 from dmcgowan/libtrust-key-fix 
Fix daemon key file location
Upstream-commit: 10ab6dcb4f8f63ffab44023d286403c494fa24b8
Component: engine
 2015-01-22 11:54:03 -08:00
Derek McGowan
64ed8c80ae Fix nits and defers 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: d55e977cf5963f8ae5efdfbee458727f704be398
Component: engine
 2015-01-22 11:22:31 -08:00
Jessie Frazelle
e1654ed3ab Merge pull request #10259 from jfrazelle/wording-of-image-verification 
Change the wording of image verification warning.
Upstream-commit: 211513156dc1ace48e630b4bf4ea0fcfdc8d9abf
Component: engine
 2015-01-22 11:14:28 -08:00
Tibor Vass
4cb12b37f1 integration-cli: Fix race in restart loop 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 752a0d6f34ee3c92dc877273c33b8cd0239fda71
Component: engine
 2015-01-22 14:06:24 -05:00
Derek McGowan
54a3834558 Add key migration integration test 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 42612ff6dba2d885a0c55af80128201a4d5166cb
Component: engine
 2015-01-22 10:51:04 -08:00
Derek McGowan
d625ce9494 Add TODO lines for windows 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a34a7930b5c1e9a1e6ddd4a40b1810a86f7d24ab
Component: engine
 2015-01-22 10:29:15 -08:00
Jessie Frazelle
e6b4861d6f Merge pull request #10266 from bobrik/no-extra-assertion 
Not doing extra assertion for io.Closer
Upstream-commit: c77c67cf87f77ad4da46ade515a4c912a3c612d9
Component: engine
 2015-01-22 10:25:23 -08:00
Arnaud Porterie
4f2ab4bd87 Merge pull request #10244 from dmcgowan/registry-panic-fix 
Fix write after close on http response
Upstream-commit: ef33efc9b9879a8397288b1bd54d8f3fd2460e56
Component: engine
 2015-01-22 10:23:11 -08:00
Alexander Morozov
d18e557951 Merge pull request #10250 from crosbymichael/stats-test 
Improve robustness of /stats api test
Upstream-commit: 4aa60a902a03294d8009747f3fc1ba26bb2fd27e
Component: engine
 2015-01-22 09:09:03 -08:00
Ian Babrou
ce792ad046 Not doing extra assertion for io.Closer 
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
Upstream-commit: 4d10b32380793ce5e324a429ce2db60125aae205
Component: engine
 2015-01-22 10:36:20 +03:00
Jessica Frazelle
72b2fe27b4 Change the wording of image verification warning. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: c97d8b1233bc17a9e58ce97473329ab5de59969a
Component: engine
 2015-01-21 18:07:10 -08:00
Michael Crosby
16972af772 Merge pull request #10257 from vieux/lol 
bump API version
Upstream-commit: 3c77e7d63446f0e0b133010fb3731af5556628bb
Component: engine
 2015-01-21 17:51:27 -08:00
Victor Vieux
fd76e3bccd bump API version 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 9c7689a10e60cd921e1521c729c07184b7c1076c
Component: engine
 2015-01-22 01:15:34 +00:00
Jessie Frazelle
331f9fe663 Merge pull request #10225 from vbatts/vbatts-init_mount_namespaces 
daemon mount namespaces
Upstream-commit: fcc4abc870e7f62590e418f10ff6f743a47fad12
Component: engine
 2015-01-21 16:55:15 -08:00
Derek McGowan
0d4aa9a72d Add key migration to daemon 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 007ef161b45dd91afcfb7ef9cd32e6c88dbf196e
Component: engine
 2015-01-21 16:55:05 -08:00
Derek McGowan
c5219e9048 Fix daemon key file location 
Fixes #10233

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 06af013f8bdf5c9af85c4b3f158292d79ab644a5
Component: engine
 2015-01-21 16:28:19 -08:00
Arnaud Porterie
ee34de2e39 Merge pull request #10235 from jfrazelle/tech-preview-warning 
Warn about tech preview of image verification.
Upstream-commit: e13559a6d69b8c192ba2e0605f956ae84d1eb0db
Component: engine
 2015-01-21 16:24:00 -08:00
Jessica Frazelle
f6fc27f6b6 Add test for pull verified 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 614e09a8c7990e05509edb4c335c4b59001cea61
Component: engine
 2015-01-21 16:25:01 -08:00
Jessica Frazelle
366e7721bb Warn about tech preview of checksums. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 1820003078eeae6ab25e2440669c490caff59b57
Component: engine
 2015-01-21 16:25:01 -08:00
Jessie Frazelle
13d7d6cab3 Merge pull request #10251 from crosbymichael/stats-zero 
Zero out stats values in the cli
Upstream-commit: 0f5eba68fbe4904090532a709e7f3769059bc0aa
Component: engine
 2015-01-21 16:16:55 -08:00
Michael Crosby
9381b90c95 Improve robustness of /stats api test 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4d7707e183e8dcb8e0ab1415e401cb530df17c92
Component: engine
 2015-01-21 16:00:15 -08:00
Michael Crosby
7304bd6808 Zero out stats values in the cli 
Based on some feedback, when you have a container via the cli that you
are monitoring for stats, if you stop the container it will stay in the
display but report the last datapoint that was received.

This PR changes the display to zero out the values for containers where
an update has not been received within a specified duration, i.e. 2
seconds.  This signals the user that the container has stopped as it
reports cpu and memory usage of 0.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: bbc38497b6f522b0a9c4e5e976abfd79692b8b5f
Component: engine
 2015-01-21 15:33:53 -08:00
Stephen J Day
bde8dbe0df Ensure that progress reader is closed after usage 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 4e4a5b25328566efad9ade3e7e0737ba48c090ab
Component: engine
 2015-01-21 15:14:01 -08:00
Derek McGowan
c43f530252 Fix write after close on http response 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 12d83e727dd3522006b53afbcfac3cdce178117a
Component: engine
 2015-01-21 15:14:01 -08:00
Jessie Frazelle
05dc63ed6e Merge pull request #10254 from LK4D4/fix_etchosts_rewriting 
Fix etchosts rewriting
Upstream-commit: f1bc0376b822128888a825c5607cee1d861e1c0b
Component: engine
 2015-01-21 15:08:45 -08:00
Alexander Morozov
0bd257dcc5 Test for updating linked hosts on restart 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 606c71d424cb21c8256968eb5d965a0855d1af2d
Component: engine
 2015-01-21 14:34:40 -08:00
Alexander Morozov
d1daac3149 Update links aliases, not name on restart 
Fixes #8721

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c2a25058e8c85b4d6295c6a1375c0b70b0959260
Component: engine
 2015-01-21 14:34:27 -08:00
Michael Crosby
32b5682b75 Merge pull request #10145 from duglin/Issue10141 
Docker run -e FOO should erase FOO if FOO isn't set in client env
Upstream-commit: edaf23b7a7f71626bdafb4e3a9677ad05fa17cab
Component: engine
 2015-01-21 14:16:51 -08:00
Michael Crosby
f3e1447653 Merge pull request #10187 from jfrazelle/update-skip-graphtest 
update graphtest
Upstream-commit: b8fe989b9b825d76cdcbd4017a26e18257e10ac1
Component: engine
 2015-01-21 14:09:16 -08:00
Michael Crosby
86dcbf6d0b Merge pull request #10243 from cpuguy83/10242_fix_stat_on_err 
Fix call to nil stat
Upstream-commit: 12dd9af95144c4047df8748567ed4a197dba769c
Component: engine
 2015-01-21 13:55:39 -08:00
Jessie Frazelle
74ee9041ea Merge pull request #10246 from crosbymichael/stats-edits 
Update to docker stats documentation post review
Upstream-commit: 649ad2d56e303013e43ef374083d97556eb94499
Component: engine
 2015-01-21 13:14:22 -08:00
Michael Crosby
f0170e8737 Update to docker stats documentation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: db9b1e3654464b0e7008fbad15d43fbbba87b1a4
Component: engine
 2015-01-21 11:44:23 -08:00
Brian Goff
5752ad288d Fix call to nil stat 
Fixes #10242

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 811b138f7e6c742b821da15e34338651f33f9ec2
Component: engine
 2015-01-21 14:25:35 -05:00
Jessie Frazelle
dcea23baf1 Merge pull request #10231 from estesp/move-iptables-check 
Move iptables check out of runtime init() to separate function
Upstream-commit: f3aed2a2974bba4fdca947227d877bcc2c7d540b
Component: engine
 2015-01-21 10:46:40 -08:00
Alexander Morozov
865afbd584 Merge pull request #10196 from bobrik/unused-compression-arg 
Removed unused compression arg in Graph.TempLayerArchive()
Upstream-commit: fd6bd8090927bbaf37682fe079a39a2fdb0f74a9
Component: engine
 2015-01-21 09:27:32 -08:00
Alexander Morozov
fdaa4278ca Merge pull request #10200 from cpuguy83/fix_racey_TestAttachAfterDetach 
Fix racey TestAttachAfterDetach
Upstream-commit: f72bcd336241ea5edbf25df6e3476d6afbd1b01d
Component: engine
 2015-01-21 09:20:24 -08:00
Arnaud Porterie
dfc1d17a7c Merge pull request #9984 from crosbymichael/metrics 
Docker stats live container resource metrics
Upstream-commit: d8a1cbe8d295660a479d53cf29ce9491ccbbc4f2
Component: engine
 2015-01-21 09:17:51 -08:00
Michael Crosby
6bc1b160e8 Exit cli when all containers when no more containers to monitor 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4b173199fde99a2b275421ed070b0ec004730e35
Component: engine
 2015-01-21 08:55:23 -08:00
Brian Goff
d8af8d0b9f Fix racey TestAttachAfterDetach 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6ef8057700b63e2c5fd5cec206915ef1f2088578
Component: engine
 2015-01-21 10:08:37 -05:00
Tibor Vass
dc648984ac Merge pull request #10227 from jlhawn/v1_v2_login_patch 
Resolve ambiguity on registry v2 ping
Upstream-commit: 9de604ad68033d08721ce61db7300cee338837e2
Component: engine
 2015-01-21 02:10:32 -05:00
Michael Crosby
b793c28c03 Remove publisher if no one is listening 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 217a2bd1b62788e53fd38810b30672db58a4efc5
Component: engine
 2015-01-20 20:21:47 -08:00
Michael Crosby
a77fb96f4c Add documentation for stats feature 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 76141a00779880368b15ef2a5ffd28a80e4637df
Component: engine
 2015-01-20 20:21:47 -08:00
Michael Crosby
045cd9fe99 Add pubsub package to handle robust publisher 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2f46b7601a3f5e11359b79624d73075b69778fbb
Component: engine
 2015-01-20 20:21:46 -08:00
Michael Crosby
debfc19162 Refactor usage calc for CPU and system usage 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2d4fc1de0560c8052b4480035bb364fb28525b39
Component: engine
 2015-01-20 20:21:46 -08:00
Alexander Morozov
5cb454e8c2 Refactor cli for stats 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: cc658804c000b8f652750ccf3233a73cc6f03073
Component: engine
 2015-01-20 20:21:46 -08:00
Michael Crosby
2dcbad59cf Evict stopped containers 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4f174aa79276c12a1b2b98df2f02d6bee36b7a93
Component: engine
 2015-01-20 20:21:46 -08:00
Michael Crosby
03d1b8dbe7 Implement client side display for stats 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2640a10bca29c4a4199c906a26f658aac8a68dc2
Component: engine
 2015-01-20 20:21:46 -08:00