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

21804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bin liu
1e6d2d1fcb fix some typos 
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: 70f1910a8bbeb3727829070a2454a636a91e2d48
Component: engine
 2015-04-17 08:12:13 +00:00
Lei Jitang
d17462b4c8 Fix weird terminal output format 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 05a8de46853f8b3534ca6d0cb03121ae214e8a34
Component: engine
 2015-04-17 15:28:12 +08:00
Masahito Zembutsu
28d382563f fix typo 
Is this typo?

Signed-off-by: Masahito Zembutsu <m.zembutsu@gmail.com>
Upstream-commit: 3cdf94ed1a8a63c068e17310ffa764230b280cbe
Component: engine
 2015-04-17 16:06:54 +09:00
Doug Davis
9a1ff57e85 Merge pull request #12468 from icecrime/disable_test_pull_verified 
Skip TestPullVerified
Upstream-commit: 5e40de92864009e7385300af1dd0a83bb4693126
Component: engine
 2015-04-17 02:31:01 -04:00
Doug Davis
711b5f704b Merge pull request #12465 from HuKeping/log-level 
Change log severity for non-tlsverify bind
Upstream-commit: d47f3707c566b74a3e71dde9a18c264a33009183
Component: engine
 2015-04-17 02:10:47 -04:00
Hu Keping
9ae8147d1a Change log severity for non-tlsverify bind 
closes #12459

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: b052f7a87cb73aa2b0d4827f6cf23b9eb0fdfa2e
Component: engine
 2015-04-17 21:27:58 +08:00
Arnaud Porterie
7e8cef686e Skip TestPullVerified 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 9a4fa9c19167756cf39a4d002efe81d4bcd3bb75
Component: engine
 2015-04-16 23:05:47 -07:00
Doug Davis
52da95a5c0 Merge pull request #12446 from icecrime/please_go_away_testexp.tar 
Always remove testexp.tar test file
Upstream-commit: 5207b3eb2b9894c282e46254b727aeee7e03e949
Component: engine
 2015-04-17 01:58:29 -04:00
Arnaud Porterie
e095f708fe Improve export/import tests cleanup 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 4e356ee410e1abb86665ab15e4c4155d7c807866
Component: engine
 2015-04-16 22:10:55 -07:00
Qiang Huang
b54e42e0d3 update docker-inspect man page 
- sort inspect out
 - update output fields
 - format output
 - add doc about go template
 - other minor fix

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 01548ed1dc25e94bf6cc7decca1d2045069dc5b1
Component: engine
 2015-04-17 09:25:06 +08:00
moxiegirl
a2f522bead Merge pull request #12455 from bfirsh/remove-registry-redirect 
Remove registry redirect
Upstream-commit: 24af87835842b2683a3862f7a32c726013d2a67a
Component: engine
 2015-04-16 17:55:02 -07:00
Yahya
776b585b81 adding elementary OS to install script 
It's basically just an Ubuntu, I'm a total noob but I've tried it on elementary OS "Freya" and it worked

Signed-off-by: M Yahya <ya7yaz@gmail.com>
Upstream-commit: b57830aee4abc86155d401b6d8a0215c3a4b5a1b
Component: engine
 2015-04-17 02:02:22 +02:00
moxiegirl
ea3916b969 Merge pull request #12383 from jdivock/patch-1 
Upstream-commit: b8530c6c5eff289b8393dd18a4d778c280511097
Component: engine
 2015-04-16 14:45:36 -07:00
moxiegirl
ce41b2a8bf Merge pull request #12452 from moxiegirl/release-versions-set 
Updating with final version from Stephen
Upstream-commit: 2ba1244ad261a85888ede933267038e362ab1a0f
Component: engine
 2015-04-16 14:31:45 -07:00
moxiegirl
9839262e56 Merge pull request #12411 from sbasyal/patch-2 
The link to issue 407 was broken
Upstream-commit: 96b5a3f562fd708fa3773acab4f358f83b97aeff
Component: engine
 2015-04-16 13:32:02 -07:00
Phil Estes
ea1d1ba304 Merge pull request #12454 from jfrazelle/bump_version 
Bump version
Upstream-commit: 4325cbb47c77dac8968091c85d8737d0a14d1f43
Component: engine
 2015-04-16 16:27:34 -04:00
Jessica Frazelle
d7c7374f11 bump version to 1.6.0-dev 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: e79c77fb8d16ba38387e43fbf9224e341f252b95
Component: engine
 2015-04-16 12:56:02 -07:00
Ben Firshman
960ca96c7d Remove registry redirect 
... it was causing an infinite redirect.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 4c6d5e3a25557b2a053e8f8e5aafc84f5f6aada8
Component: engine
 2015-04-16 12:54:56 -07:00
Jessica Frazelle
fb913ffded Bump version to v1.6.0 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

(cherry picked from commit 47496519da9664202d900d3635bb840509fa9647)
Upstream-commit: 99d0413033e6ecf05a30eac18d51349ef859a9c7
Component: engine
 2015-04-16 12:45:02 -07:00
Antonio Murdaca
47592700e5 Add minor stylistic fixes 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 1c89c6ea2f34f51a05215279c9cdefca30bb13b1
Component: engine
 2015-04-16 21:22:32 +02:00
Michael Crosby
168a9e925d Merge pull request #12428 from icecrime/1163_carry 
Added documentation for functions
Upstream-commit: cb0644a196e0a91de50e81daa5fcf3b2645a8d45
Component: engine
 2015-04-16 11:43:29 -07:00
Mary Anthony
917596f19e Updating with final version from Stephen 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b4b21ff0a6c45c1565c74e6f923b2c7e8ca565d6
Component: engine
 2015-04-16 11:40:36 -07:00
Alexander Morozov
049ea91a21 Merge pull request #12407 from cpuguy83/move_integration_api_tests 
Move some integration api tests
Upstream-commit: 27edbd2868c5e44d54c5a51ca220fa4cd568e17a
Component: engine
 2015-04-16 11:40:29 -07:00
Jessie Frazelle
ed720afd56 Merge pull request #12451 from moxiegirl/release-versions-set 
doc fixes for 1.6
Upstream-commit: dfa5feab2fd31486f7e7bc532eac213dbaaea45d
Component: engine
 2015-04-16 11:35:46 -07:00
Mary Anthony
fdae7fc749 for 1.6 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f44aa3b1fbe5e042fee0fb78507ebac35eca3d04
Component: engine
 2015-04-16 11:33:49 -07:00
Brian Goff
b5835957f0 Move TestPostCreateNull to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 308a23021d65282cdf471ef0708ba5998b48c247
Component: engine
 2015-04-16 13:49:46 -04:00
Brian Goff
6688a2d031 Move TestPostJsonVerify to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5dc02a2fa8819b3a61bcd5a6fedcfb1a5e64cba5
Component: engine
 2015-04-16 13:49:28 -04:00
Brian Goff
3cb6dbb528 Move TestContainerApiCreate to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 23fa7d41d5510131cdf7883a930087ac4fb34187
Component: engine
 2015-04-16 13:49:10 -04:00
Brian Goff
9e85fe7e11 Move TestPostCommit to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f19061ccfd526487391f7677bef7e1b38694d06a
Component: engine
 2015-04-16 13:48:54 -04:00
Brian Goff
51eea9357f Move TestGetContainersTop to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d9e4b14346c6a93bee8c24803a8538dc2d74911d
Component: engine
 2015-04-16 13:48:33 -04:00
Brian Goff
f8e57bde88 Move SaveAndThenload to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6f5b895bc767585be9a8e1109672fb4946e56f15
Component: engine
 2015-04-16 13:40:49 -04:00
Brian Goff
c48f58ea6d Make sockRequestRaw return reader, not []byte 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8232cc777e329a47e123dbdc42411dae65288a80
Component: engine
 2015-04-16 13:40:49 -04:00
Alexander Morozov
07ce310610 Merge pull request #12350 from runcom/remove-job-restart 
Remove job from restart
Upstream-commit: 5224151da9cab6af4412d1dcdd81cf0cf76763f7
Component: engine
 2015-04-16 10:27:43 -07:00
Antonio Murdaca
105ea026b0 Remove job from restart 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e41192a3f8cbfbbfecde03f58a3b2be2b1afd836
Component: engine
 2015-04-16 18:50:24 +02:00
Arnaud Porterie
10d974ead9 Add -H|--human flag to docker history 
Add a flag to print sizes and dates in human readable format.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ae5cf30c7c6630d201ef14e2e460f4164f58a261
Component: engine
 2015-04-16 08:38:18 -07:00
Dave Henderson
8b3da7ead2 Adding a verbose time option to output formatted timestamps 
Fixes #11413

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
Upstream-commit: dcff07d03d9accbedd2467fe9c7c10fba7c2b35c
Component: engine
 2015-04-16 08:34:50 -07:00
Brian Goff
94c3eb9bd3 Merge pull request #12431 from YanFeng-Adam/typo 
Fix a typo in docker/daemon/state.go
Upstream-commit: 17ef617c770f70b484216dedd668585597cbd9f1
Component: engine
 2015-04-16 09:52:40 -04:00
Yan Feng
6cf040802b Fix a typo in docker/daemon/state.go 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 7e01ecc119ea3871058309a47a3f9cbf2a9483dd
Component: engine
 2015-04-16 10:56:15 -04:00
Ma Shimiao
00001e0281 optimize code to clarify logic 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 93cdb0071be29cde5e9f5574926ae628ef4cfc41
Component: engine
 2015-04-16 19:56:25 +08:00
Ma Shimiao
8412ee62f9 add err check before getting term 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 73bf9b5c195170b3d71f86b285ac12e50d26ef51
Component: engine
 2015-04-16 17:46:32 +08:00
Jessie Frazelle
586b88bb0d Merge pull request #12423 from crosbymichael/idkbutitworks 
Ensure state is destroyed on daemont restart
Upstream-commit: 1899b2f41a73a6596ba167c9c710affde3dae550
Component: engine
 2015-04-15 21:19:38 -07:00
Jason Smith
0d7f000ebe added documentation for functions 
Signed-off-by: Jason Smith <jasonrichardsmith@gmail.com>
Upstream-commit: dc104ccb40b66a89611f11737d78a2ad31102427
Component: engine
 2015-04-15 19:28:01 -07:00
Sven Dowideit
74e64db38a Merge pull request #12426 from moxiegirl/new-registry-menu 
In with the old menu layout
Upstream-commit: ad5d655fb2010b61995c9380346f8057e11b0056
Component: engine
 2015-04-16 12:22:49 +10:00
Mary Anthony
0e1a426ed8 In with the old menu layout 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fe8fb24b530016e56ab584526c093daccacf6040
Component: engine
 2015-04-15 19:02:01 -07:00
Brian Goff
884bdce09a Merge pull request #12253 from calavera/remove_job_from_start_and_create 
Remove engine.Job from Start and Create
Upstream-commit: de923f59b3860eba2c87e8a533b385ac5752243b
Component: engine
 2015-04-15 21:49:25 -04:00
Michael Crosby
d0cae5a6bf Ensure state is destroyed on daemont restart 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a5f7c4aa31fa1ee2a3bebf4d38f5fda7a4a28a0d
Component: engine
 2015-04-15 17:44:03 -07:00
Alexander Morozov
1fe5faa4a6 Merge pull request #12388 from xiaods/issue-12373 
client.StatusError don't be returned as a pointer
Upstream-commit: 83d809f3d2742b85933ba8a93fa7d46fe48495dc
Component: engine
 2015-04-15 17:34:38 -07:00
Steven Taylor
34b09a1968 What if authConfig or factory is Null? 
Signed-off-by: Steven Taylor <steven.taylor@me.com>
Upstream-commit: d1855c6cc0cb28fed7426ee3024f147e74ac828e
Component: engine
 2015-04-15 15:35:18 -07:00
Jessie Frazelle
9fa728d386 Merge pull request #12391 from ibuildthecloud/syslog-format 
Change syslog format and facility
Upstream-commit: 2e4d36ed80855375231501983f19616ba0238a84
Component: engine
 2015-04-15 14:47:12 -07:00
Sabin Basyal
8d7292b69d The link to issue 407 was broken 
The link to issue 407 was broken. The old link was: https://github.com/docker/docker/issues/407%20kernel%20versions
The link must be: https://github.com/docker/docker/issues/407

Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
Upstream-commit: 6860c75b7b4011fd4cc48f5d9a1458e49fb86b60
Component: engine
 2015-04-15 14:06:11 -07:00