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

712 Commits

Author SHA1 Message Date
Michael Crosby
483871b67f Merge pull request #12172 from ZJU-SEL/change_stats 
change memory usage display
Upstream-commit: 6fa2a1e486797c1aa151e242902bed716347850f
Component: engine
 2015-04-13 13:32:45 -07:00
Michael Crosby
20c653370b Merge pull request #12222 from chenhanxiao/cp-support-colon 
cp: add support for copy filename with ":"
Upstream-commit: 75b911eb3cb12e4c4d86fd42aa12bc71458f77b1
Component: engine
 2015-04-13 13:09:12 -07:00
Evan Hazlett
97f1b60257 Merge pull request #12301 from ewindisch/https_links 
Use HTTPS links for URLs in READMEs / comments / docs
Upstream-commit: 3509132a6e28caa18003298521c58746f490b57b
Component: engine
 2015-04-13 14:30:53 -04:00
Michael Crosby
05674d127e Merge pull request #12320 from runcom/fix-api-resize-exec-resize 
fix api server resize&execResize
Upstream-commit: 6f928be7ef7d8610875e860e72433dc2477b1c5d
Component: engine
 2015-04-13 09:59:11 -07:00
Michael Crosby
ccda6c3ec6 Merge pull request #12279 from runcom/remove-job-commit 
Remove job from commit
Upstream-commit: 33e83d05813207247ffcd0be0ccf6a6a7ad25b64
Component: engine
 2015-04-13 09:57:54 -07:00
Brian Goff
b802ea45ca Merge pull request #12312 from runcom/remove-job-container-stats 
Remove job from container stats
Upstream-commit: 12eff0c26f9d7fb5f0b1f1cbb975b8892c2dc306
Component: engine
 2015-04-13 11:58:31 -04:00
Brian Goff
0118377dec Merge pull request #12313 from runcom/remove-job-export 
Remove job from export
Upstream-commit: a4f98d32258b8e209ab2702f0d0a092a7ffe15a2
Component: engine
 2015-04-13 11:57:55 -04:00
Alexander Morozov
416e9ff40b Merge pull request #12304 from runcom/remove-job-logs 
Remove job from logs
Upstream-commit: bfb487dc50e3b88b520678a9118bfb95891140cb
Component: engine
 2015-04-13 08:38:46 -07:00
Antonio Murdaca
ebe83bc94c Remove job from export 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6b737752e342e30dd20417b18c92c9b4e1c4f8da
Component: engine
 2015-04-13 15:27:45 +02:00
Antonio Murdaca
83596c55e6 fix api server resize&execResize 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 3341f3a3554524f0f5e6114dfa0ed988713803ef
Component: engine
 2015-04-13 08:42:12 +02:00
Antonio Murdaca
b2c60bfa72 Remove jobs from stats 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 65a056345cec1b85bd41ed70ee814894709ee6c0
Component: engine
 2015-04-13 08:33:53 +02:00
Antonio Murdaca
b3c5a7d38d Remove job from logs 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 91bfed604959c591a076c2e330cb3ded7443f504
Component: engine
 2015-04-13 08:25:31 +02:00
Doug Davis
6b4495dbae Merge pull request #12305 from runcom/remove-job-exec-inspect 
Remove job from execInspect
Upstream-commit: a54fd325e6bd0c5a1c298deef48399fe6e59aa33
Component: engine
 2015-04-12 08:30:38 -04:00
Antonio Murdaca
d05177503f Remove job from stop 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 04cc6c6aa4f8ea656d23268b7bff0136e4fc6c8d
Component: engine
 2015-04-12 00:41:16 +02:00
Antonio Murdaca
62d48e6c18 Remove job from execInspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 621ee1f6a4cbc8ee8758ce77a0cf6215c88f12f7
Component: engine
 2015-04-12 00:15:34 +02:00
Eric Windisch
0551904b7c Link to HTTPS URLs in engine comments 
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: ca37301d54e1525d4522dea266180072d4fd892b
Component: engine
 2015-04-11 13:31:34 -04:00
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
e41d53c507 Remove job from commit 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c8529fde5f6f2e4b62f9c1b3382fd814c11a7639
Component: engine
 2015-04-11 00:20:45 +02: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
Chen Hanxiao
88ea73a6aa cp: add support for copy filename with ":" 
We use ":" as separator CONTAINER:PATH.
This patch enables copy filename with ":"
to host.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 50372973884d96ee115094336ed1952b1e71250a
Component: engine
 2015-04-10 00:08:05 -04: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