docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,070 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

3070 Commits

Author SHA1 Message Date
Sun Hongliang 6cd8a06c8f fix typos in test and other files 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-05-02 07:29:33 +08:00
Alexandre Beslic 2a722a4058 Merge pull request #2194 from allencloud/use-engineapi-to-replace-dockerclient 
use engine-api to replace dockerclient
 2016-04-30 15:43:08 -07:00
Sun Hongliang eafd9d658d use engine-api to replace dockerclient 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-05-01 00:14:00 +08:00
Dong Chen 92834d1fa1 Update stats test to stop connection 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-04-29 17:58:52 -07:00
Dongluo Chen 04b70bff15 Merge pull request #2154 from xianlubird/master 
Fix the bug that start container mess the host config
 2016-04-29 17:02:08 -07:00
Sebastiaan van Stijn 31fe6179ab Merge pull request #2185 from SvenDowideit/use-docs-base-oss 
convert docs Dockerfiles to use docs/base:oss
 2016-04-30 01:05:26 +02:00
Alexandre Beslic dd90e08024 Merge pull request #2176 from allencloud/close-http-response-body-to-avoid-memory-leak 
close http response body to avoid potential memory leak
 2016-04-28 18:23:25 -07:00
Victor Vieux 9dd298589d Merge pull request #2177 from jimmyxian/add-support-ps-filter-volume 
add support ps --filter volume
 2016-04-28 17:59:44 -07:00
drew ogryzek d2c9f8bc9a Update Edits 
Signed-off-by: drew ogryzek <drew@drewbro.com>
 2016-04-28 16:23:39 -07:00
drew ogryzek 354a71b4cf Edit typos in 'Try Swarm at scale' 
Signed-off-by: drew ogryzek <drew@drewbro.com>
 2016-04-28 16:23:39 -07:00
Sven Dowideit 77e88346c5 convert docs Dockerfiles to use docs/base:oss 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-04-28 12:57:35 +00:00
xianlubird a3986cac05 Fix the bug that start container mess the host config 
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
 2016-04-28 10:32:41 +08:00
Victor Vieux c07a84529d Merge pull request #2175 from nishanttotla/remove-type-conversions 
Remove type unnecessary type conversion
 2016-04-27 18:09:51 -07:00
Dongluo Chen 797bdd5775 Merge pull request #2169 from allencloud/add-NodeID-in-docker-info 
add NodeID in docker info
 2016-04-27 13:08:12 -07:00
Xian Chaobo f39ac0e2c2 add support ps --filter volume 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2016-04-27 15:10:54 +08:00
Sun Hongliang b5a74ee875 close http response body to avoid potential memory leak 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-27 12:14:36 +08:00
Dongluo Chen d0bc1833d0 Merge pull request #2165 from nishanttotla/change-of-context 
Change context.TODO() to context.Background()
 2016-04-26 17:49:20 -07:00
Sun Hongliang 8cca29e9a9 add NodeID in docker info 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-27 08:30:30 +08:00
Nishant Totla c70f836e88
Remove type unnecessary type conversion 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-26 13:42:17 -07:00
Nishant Totla 5cb4faad2b Merge pull request #2171 from allencloud/add-return-when-getting-an-httpError 
return immediately when getting an httpError to avoid response mixture
 2016-04-26 13:07:20 -07:00
Alexandre Beslic 258e9d6752 Merge pull request #2173 from vieux/fix_tests 
fix swarm build in tests
 2016-04-26 11:19:52 -07:00
Victor Vieux ef7e2777a8
fix swarm build in tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-26 11:16:37 -07:00
Sun Hongliang 4d9e8dc42d return immediately when getting an httpError to avoid response mixture 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-27 01:00:10 +08:00
Nishant Totla 6998163ab1
Change context.TODO() to context.Background() 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-25 13:59:21 -07:00
Victor Vieux e19990d2f5 Merge pull request #2164 from vieux/rollback_to_1.5.4 
rollback to Go 1.5.4
 2016-04-25 13:57:53 -07:00
Alexandre Beslic 2044af6949 Merge pull request #2143 from allencloud/remove-empty-vendor-in-stretchr-testify 
remove empty vendor in stretchr testify
 2016-04-25 11:34:36 -07:00
Nishant Totla e4bab6cf07 Merge pull request #1942 from allencloud/api-response-status-code-comparison 
add documentation describing the difference in api response status code.
 2016-04-25 10:36:09 -07:00
Sun Hongliang 61e0ccd243 add documentation describing the difference in api response status code. 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-26 01:21:23 +08:00
Alexandre Beslic 0524ead8da Merge pull request #2160 from nishanttotla/fix-typo-contributing 
Fix typo in CONTRIBUTING.md
 2016-04-24 16:04:40 -07:00
Sun Hongliang fa8b2737a1 remove empty vendor in stretchr testify 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-24 14:55:56 +08:00
Nishant Totla 95f495b589
Fix typo in CONTRIBUTING.md 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-23 20:10:59 -07:00
Nishant Totla a8c8eb8080 Merge pull request #2159 from allencloud/fix-and-format-changelog 
fix some typos and format CHANGELOG.md
 2016-04-23 12:55:27 -07:00
Sun Hongliang 933ae477b6 fix some typos and format CHANGELOG.md 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-23 17:00:20 +08:00
Victor Vieux c882e5e5a7 rollback to Go 1.5.4 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-23 01:50:10 -07:00
Dongluo Chen 584e10c9f9 Merge pull request #2158 from dongluochen/bump-1.2.1rc1 
bump 1.2.1-rc1
 2016-04-22 22:07:54 -07:00
Dongluo Chen bf9e985d5b Merge pull request #2132 from nishanttotla/image-ops-engine-api 
Moving last few image operations to engine-api
 2016-04-22 22:05:02 -07:00
Dong Chen 7cca0cbcde Bump 1.2.1-rc1 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-04-22 17:57:33 -07:00
Alexandre Beslic af4474d250 Merge pull request #2086 from vieux/event_engine-api 
use engine-api for events
 2016-04-22 14:57:49 -07:00
Victor Vieux b352839605
@abronan's typo 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-22 14:17:32 -07:00
Victor Vieux a03b709728 fix rebase 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-22 13:49:12 -07:00
Nishant Totla 4d56ba5190
Moving last few image operations to engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-22 13:47:51 -07:00
Victor Vieux a33d650edb Merge pull request #2156 from vieux/1.6.2 
switch to go 1.6.2
 2016-04-21 17:52:17 -07:00
Victor Vieux 7882873d0a switch to go 1.6.2 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-21 17:11:32 -07:00
Dongluo Chen 10106f3db5 Merge pull request #2101 from allencloud/return-err-when-assertion-fails-in-hijack 
return an error when assertion fails in hijack
 2016-04-21 17:05:52 -07:00
Alexandre Beslic cf9806004f Merge pull request #2126 from vieux/update_compose 
update compose, remove useless bash and improve tests
 2016-04-21 16:51:37 -07:00
Dongluo Chen d9beef7635 Merge pull request #2136 from doronp/Fix_Docs 
Fix docs
 2016-04-19 10:20:40 -07:00
Doron Podoleanu 7e119761d4 Fix docs 
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
 2016-04-19 16:11:57 +03:00
Dongluo Chen 78bacff06a Merge pull request #2131 from jimmycmh/master 
Fix bug: stop/restart/kill an inexisting container returns 500 rather than 404
 2016-04-15 19:25:40 -07:00
menghui.chen 4a54b63c42 Fix bug: stop/restart/kill an inexisting container returns 500 rather than 404 
Signed-off-by: menghui.chen <menghui.chen@alibaba-inc.com>
 2016-04-15 19:32:29 +08:00
Sun Hongliang 4c90767e60 return an error when assertion fails in hijack 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-15 13:31:18 +08:00