p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,633 Commits 2 Branches 295 Tags
ca227f785428524ff057cf081ca2cfd905761e95
Commit Graph

694 Commits

Author SHA1 Message Date
jianbosun
ca227f7854 change memory usage display 
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Upstream-commit: d6d8f45b04a6e6d0b616c85d1885342d3e676ec1
Component: engine
 2015-04-11 20:04:34 +08:00
Antonio Murdaca
928371a2db Remove job from wait 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: db0ffba3b92aeda667501aaa10926943a7738f82
Component: engine
 2015-04-10 20:17:02 +02:00
Michael Crosby
1f992e6c96 Merge pull request #12259 from duglin/RemoveJobTop 
Remove Job from `docker top`
Upstream-commit: bae3273ef4e61fd04c0dd4ddb1527aa7c4f9bfb6
Component: engine
 2015-04-10 10:56:01 -07:00
Michael Crosby
ff94291067 Merge pull request #12248 from duglin/RemoveJobKill 
Remove Job from `docker kill`
Upstream-commit: 267bd51adbf9e344a5d18bb0c7df4e09bcb60668
Component: engine
 2015-04-10 10:52:18 -07:00
Brian Goff
9aebeb40a8 Merge pull request #12260 from HuKeping/rmjob-history 
Remove Job from History API
Upstream-commit: 0693e34d7ec65e0735b2f9b36e326a1ee7d6942e
Component: engine
 2015-04-10 09:53:05 -04:00
Hu Keping
fbe401b655 Remove Job from History API 
a part of issue #12151

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 5c7c3fea6caf43d51344faaf190b869db1b44f46
Component: engine
 2015-04-10 21:37:56 +08:00
Tibor Vass
5ed91523df Rebase + some fixes 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: fa2ace00a833492123f7db1e2f867f70bab89be4
Component: engine
 2015-04-09 21:29:42 -04:00
David Young
807d6f107a Add comment column in docker history command output 
Signed-off-by: David Young <yangboh@cn.ibm.com>
Upstream-commit: bf57339527f153b502a6443a495824a40768e39f
Component: engine
 2015-04-09 21:29:41 -04:00
Doug Davis
681bfa410b Remove Job from docker top 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3e096cb9c9e9d708df7982be5694daaa62bb4849
Component: engine
 2015-04-09 18:17:50 -07:00
Doug Davis
4ef2fa0ccf Remove Job from docker kill 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3cb751906a8a0397dcf57d8fca97c0e9c0c418e8
Component: engine
 2015-04-09 16:06:54 -07:00
Antonio Murdaca
7e0beddb7a Remove job from resize&execResize 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e290a22dc935c2472e08be7362b7d3b0f6303615
Component: engine
 2015-04-10 00:56:43 +02:00
Michael Crosby
49e1965bf2 Merge pull request #12249 from runcom/remove-job-pause-unpause 
Remove job from pause/unpause
Upstream-commit: eebfcde0ea459bc9100ddde4b3c4e13a06a472cc
Component: engine
 2015-04-09 15:09:48 -07:00
Alexander Morozov
bdab727fe0 Merge pull request #12092 from tiborvass/no-jobs-networkdriver-bridge 
Remove jobs from daemon/networkdriver/bridge
Upstream-commit: 67676529b373c39c239ff7c8f4a374ae97659523
Component: engine
 2015-04-09 14:10:21 -07:00
Antonio Murdaca
f7db80586a Remove job from pause/unpause 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 5ccb1c764b04449811aa4d8095a9ee609b901cf7
Component: engine
 2015-04-09 22:50:48 +02:00
Alexander Morozov
1164c8a3e0 Removed engine from /copy 
* Client and server use types.CopyConfig
* API calls container.Copy directly

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ccdef895def5e42706e792b4891ad2d06bbf488a
Component: engine
 2015-04-09 13:05:31 -07:00
Alexander Morozov
6ece2fa7f9 Merge pull request #12234 from runcom/remove-job-rmi 
Remove job from rmi
Upstream-commit: 92a775bd7a8a379d92a83cc49bd78ec74d7c126d
Component: engine
 2015-04-09 11:24:20 -07:00
Alexander Morozov
f97c21daca Merge pull request #12197 from runcom/remove-job-rm 
Remove job from rm
Upstream-commit: 3218f3936dda688ef7bee0b196895d00284d7538
Component: engine
 2015-04-09 11:21:52 -07:00
Antonio Murdaca
b19229f86e Remove job from rmi 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e4afc379dcee66475f3becb34cd2675f3ee9279c
Component: engine
 2015-04-09 19:39:14 +02:00
Alexander Morozov
ea52df6141 Fix regressions in attach 
* Wrong bool parsing
* Attach always all streams

Were introduced in #12120

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 0fec3e19dbff15b3cd8fa3693f694e34d8dcc5a9
Component: engine
 2015-04-09 09:58:44 -07:00
Antonio Murdaca
601b29bbae Remove job from rm 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: db13cb7f98a30169311cf2e4a80867a94f49d377
Component: engine
 2015-04-09 18:46:24 +02:00
Alexander Morozov
c900c31960 Merge pull request #12184 from duglin/RemoveJobImages 
Remove Job from `docker images`
Upstream-commit: 6ba7bf440ee1604486015f421456668d00e795a2
Component: engine
 2015-04-09 09:19:09 -07:00
Doug Davis
0eb6cc5ff7 Merge pull request #12207 from WiseTrem/getBoolParam 
Removing unused getBoolParam func from api/server/server.go
Upstream-commit: 8295bed3df0e92adfa784ed2564ba094202924d4
Component: engine
 2015-04-09 08:28:48 -07:00
Hu Keping
16b268e23a Remove Job from rename 
A part of ISSUE#12151-Remove engine.Job mechanism

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 49c4de4aebe0ecc3005e56a9ab06b5e43f5b312c
Component: engine
 2015-04-10 01:52:55 +08:00
WiseTrem
85a5c923c7 Removing unused getBoolParam func from api/server/server.go 
Fix #12199

Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com>
Upstream-commit: 0fc75a3136456621c074124819567816420f55bf
Component: engine
 2015-04-09 09:13:16 +03:00
Doug Davis
8bd8b0185d Remove Job from docker images 
Also removes engine.Table

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d045b9776b5dc16e12b3d7c7558a24cdc5d1aba7
Component: engine
 2015-04-08 19:33:01 -07:00
Tibor Vass
0c091d906f Remove jobs from daemon/networkdriver/bridge 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 53582321ee502335a9c3be4789bef984e09f77c4
Component: engine
 2015-04-08 18:50:29 -04:00
Arnaud Porterie
58278c5226 Merge pull request #12163 from duglin/RemoveJobPS 
Remove Job from PS API
Upstream-commit: 7233bd223d4760af604e619a06c2c9ffe3fa1e22
Component: engine
 2015-04-08 13:43:47 -07:00
Megan Kostick
584caa6937 Fixing JSON Tags 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: 88119bb276aec5a5b5fd271a2ef6ebd8ad0fa042
Component: engine
 2015-04-08 12:05:12 -07:00
Doug Davis
b3b1e4936b Remove Job from PS API 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1bfa80bdd9ac05b01867492d2e6dda668aa7715c
Component: engine
 2015-04-08 10:30:17 -07:00
Alexander Morozov
c65fa515f2 Merge pull request #12066 from LK4D4/split_events 
Remove engine usage from events
Upstream-commit: 3ebfc99d1057d841c1cdd4f19e80fceea5ab380e
Component: engine
 2015-04-08 08:29:24 -07:00
Antonio Murdaca
f3e1f81e2d Remove engine.Job from diff 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e379e2668cecf8a0f9ef29eb57ee881f4d313d58
Component: engine
 2015-04-08 15:52:10 +02:00
Tibor Vass
c29bb140cc Merge pull request #12120 from LK4D4/split_attach 
Remove engine usage from attach
Upstream-commit: dccda72a41638c16b63c166d65a1ed663f01b60c
Component: engine
 2015-04-07 18:13:35 -04:00
Alexander Morozov
49e191d0e4 Remove engine usage from attach 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c44f513248a8b40b1b2221726c7441881383e919
Component: engine
 2015-04-07 14:23:09 -07:00
Phil Estes
b525e35a97 Merge pull request #12129 from duglin/RemoveTable5 
Remove engine.Table from more daemon side stuff
Upstream-commit: e011119a497b6c6c18a6d1f048b1e69e2ab2eb7a
Component: engine
 2015-04-07 12:53:55 -04:00
Alexander Morozov
0d3afdf0c8 Remove engine usage for events 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c9eb37f9752d72d9a4280d703368e5e73adfffa1
Component: engine
 2015-04-07 08:43:18 -07:00
Doug Davis
d5f5705973 Remove engine.Table from more daemon side stuff 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 650bc2ffe545f874adeb3c1d6f54e9158a7d647e
Component: engine
 2015-04-06 15:06:02 -07:00
Ahmet Alp Balkan
02aa86f034 Swap width/height in GetWinsize and monitorTtySize 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 6e44246fed43341938a41c6db9b115e1e64d332a
Component: engine
 2015-04-06 14:31:42 -07:00
Phil Estes
d69d67a964 Merge pull request #12070 from duglin/RemoveTableCLI 
Last step in removing engine.Table from api/client/*
Upstream-commit: dec48d6708aa9fc7732d2451d9913e612fc989be
Component: engine
 2015-04-06 16:33:29 -04:00
Arnaud Porterie
142a5765d0 Merge pull request #11978 from x1022as/info-show-loggingdriver 
docker info show logging driver info
Upstream-commit: ed8d4028519460017e5a8641882bd9a2e68ceb29
Component: engine
 2015-04-06 11:11:31 -07:00
Doug Davis
ef8d6cbdf1 Last step in removing engine.Tabel from api/client/* 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 065648a8324a0df5d5d05b3df223e6b058260425
Component: engine
 2015-04-06 10:55:53 -07:00
Shishir Mahajan
9d18deed31 Applying: Fix for Issue 11285: warning message displayed when updating an existing image 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 7d0053d554c453f0ec426bde2899dd55a265f09a
Component: engine
 2015-04-06 09:05:03 -04:00
Jessie Frazelle
8973909f13 Merge pull request #12060 from duglin/RemoveTable3 
Remove engine.Table from docker search and fix missing field
Upstream-commit: b2fbd9e632191e6d6494b7dfd4dc0798e1fa47c7
Component: engine
 2015-04-03 21:29:36 +00:00
Doug Davis
938f87c2dd Remove engine.Table from docker search and fix missing field 
registry/SearchResults was missing the "is_automated" field.
I added it back in.

Pull this 'table' removal one from the others because it fixed
a bug too

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 67b4cce0f6c835cf9e53313a026af2e825ba8b10
Component: engine
 2015-04-03 11:27:30 -07:00
Michael Crosby
dd7175bcb6 Merge pull request #12010 from ibuildthecloud/small 
Small changes from #11967 for review comments
Upstream-commit: e64f6baf116771b22a3050cf686624dbb6b19f37
Component: engine
 2015-04-03 11:27:06 -07:00
Jessie Frazelle
513240409b Merge pull request #11981 from unclejack/fix_profiler 
api/server: fix profiler HTTP serving
Upstream-commit: b3e9c274ddadde302d927a866c8704be77c871e0
Component: engine
 2015-04-03 18:25:12 +00:00
Michael Crosby
c121c9b8d9 Merge pull request #12058 from duglin/RemoveTable2 
Remove engine.Table from docker history and docker rmi
Upstream-commit: 326a5545d43b63c1f806c3106be884c06facd77b
Component: engine
 2015-04-03 10:57:52 -07:00
Doug Davis
3a500e0f89 Remove engine.Table from docker history and docker rmi 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0b2fa9c707ab06836cf5dd7b3ca9efac64bba925
Component: engine
 2015-04-03 08:31:30 -07:00
Yuan Sun
8c6dabaae6 If docker search with --starts=${negative number}, it would show the warning. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 87e0e4eb431693cf1eeed777c6c4648ae0a94395
Component: engine
 2015-04-03 08:55:34 +08:00
Doug Davis
68cf0c513e Remove use of Table from 'docker diff' 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 49c72506ace177e33d867123ca15f193c38bcf45
Component: engine
 2015-04-02 16:55:58 -07:00
unclejack
842af15e9f api/server: fix profiler HTTP serving 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 3bea892d5458fc627f2ebe26f44a09df018d1fcc
Component: engine
 2015-04-02 09:53:40 +03:00