centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-13 14:56:12 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,967 Commits 59 Branches 28 Tags
d9beef7635db2b8a10da072de5f6ad748fd831e1
Commit Graph

2967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Victor Vieux
7e69ac36aa Merge pull request #2120 from HackToday/fixtypo 
Fix some typo
 2016-04-14 22:26:55 -07:00
Victor Vieux
a799f540a1 Merge pull request #2130 from atlassian/issue-2129 
Teardown function needs to be declared before tests.
 2016-04-14 22:11:44 -07:00
Otto Jongerius
5d66dd33a8 Teardown function needs to be declared before tests. 
Signed-off-by: Otto Jongerius <ojongerius@atlassian.com>
 2016-04-15 15:50:02 +12:00
Dongluo Chen
84a28a7de4 Merge pull request #2116 from MHBauer/volume-rm-race 
volume rm integration test needs wait to avoid race
 2016-04-14 17:47:30 -07:00
Kai Qiang Wu(Kennan)
7f5972124b Fix some typo 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-04-15 00:45:21 +00:00
Dongluo Chen
a91c6e0159 Merge pull request #2128 from nishanttotla/container-ops-engine-api 
Move container rename and remove to engine-api
 2016-04-14 17:31:09 -07:00
Dongluo Chen
a4dda5bc97 Merge pull request #2124 from vieux/vendor 
move dependencies to vendor/
 2016-04-14 17:12:48 -07:00
Dongluo Chen
d807d97aea Merge pull request #2127 from nishanttotla/container-start 
Moving start container to engine-api
 2016-04-14 16:36:15 -07:00
Nishant Totla
3680a717a1 Move container rename and remove to engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 16:00:36 -07:00
Nishant Totla
524f5ca79c Moving start container to engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 15:08:39 -07:00
Victor Vieux
d006ef95f0 move dependencies to vendor/ 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-14 13:25:16 -07:00
Nishant Totla
09deb06382 Merge pull request #2123 from vieux/migrate_go_16 
bump to 1.6.1
 2016-04-14 12:03:33 -07:00
Victor Vieux
a764f9ac0a Merge pull request #1983 from nishanttotla/container-config-engine-api 
Updating ContainerConfig to use engine-api
 2016-04-14 11:48:51 -07:00
Victor Vieux
d365b25558 bump to 1.6.1 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-14 11:41:05 -07:00
Nishant Totla
8d99298648 Fix deprecated config for engine < 1.7, image pull waits for end of 
response

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:37:01 -07:00
Nishant Totla
e29ff44caf Fixing integration tests 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:37:01 -07:00
Nishant Totla
af5ce4bdb0 Returning error when Image Pull fails 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:37:01 -07:00
Nishant Totla
40456d0926 Updating unit tests 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:37:01 -07:00
Nishant Totla
f5e578188f Updating ContainerConfig to embed HostConfig and NetworkingConfig 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:37:00 -07:00
Nishant Totla
ff0c79e08d Fix image pull bug (wait until download finishes) 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:37:00 -07:00
Nishant Totla
2363ea8077 Updating Godeps (distribution/reference) 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:37:00 -07:00
Nishant Totla
25241bdd08 Updating Image Pull to use docker/distribution package 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:37:00 -07:00
Nishant Totla
0b75203143 Update container state (from PR samalba/dockerclient#/236) 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:37:00 -07:00
Nishant Totla
859c710bdd Updating scheduler unit tests 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:37:00 -07:00
Nishant Totla
6d2937b3ec Updating cluster unit tests 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:36:59 -07:00
Nishant Totla
11df80601c Updating cluster 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:36:59 -07:00
Nishant Totla
48cd1ebd69 Updating filters 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:36:59 -07:00
Nishant Totla
81e1528d0f Updating API handlers 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:36:59 -07:00
Nishant Totla
79575f3df6 Updating ContainerConfig to use engine-api 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-14 09:36:59 -07:00
Victor Vieux
a6c1f1463c Merge pull request #2118 from vieux/update_changelog 
update CHANGELOG.md
 2016-04-13 09:59:32 -07:00
Dongluo Chen
612f397a3c Merge pull request #2078 from moxiegirl/fix-swarm-scale-doc 
Swarm at scale with local docker vms
 2016-04-13 09:56:09 -07:00
Mary Anthony
70a180cb30 Redoing the example for local machines 
Updating images
Adding in the Compose solution
Copy edits
Updating with Dong's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-04-13 09:45:04 -07:00
Nishant Totla
58f60ddb09 Merge pull request #2117 from kencochrane/more_typo_fixes 
Fixed some typos in the docs
 2016-04-13 09:13:18 -07:00
Ken Cochrane
ce1dffa58a Fixed more typos in the docs 
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2016-04-13 09:44:32 -04:00
Morgan Bauer
d2e375e31d volume rm integration test needs wait to avoid race 
- additional comments in test

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2016-04-13 11:47:00 +01:00
Victor Vieux
b82aa273d9 update CHANGELOG.md 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-12 22:34:15 -07:00
Victor Vieux
2bbea5d1a4 Merge pull request #2115 from vieux/update_to_1.5.4 
update to go 1.5.4
 2016-04-12 22:23:49 -07:00
Victor Vieux
a213794b55 Merge pull request #2114 from vieux/GOOS_dockerfile 
Add GOOS buildarg in dockerfile
 2016-04-12 21:59:32 -07:00
Victor Vieux
03f7a1167d update to 1.5.4 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-12 20:08:36 -07:00
Victor Vieux
418118057d Add GOOS buildarg in dockerfile 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-04-12 17:14:22 -07:00
Nishant Totla
767c182562 Merge pull request #2113 from kencochrane/doc_typo_fix 
Fixed a couple typos in the docs
 2016-04-12 14:42:01 -07:00
Ken Cochrane
08cacffd97 Fixed a couple typos in the docs 
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2016-04-12 17:26:30 -04:00
Dongluo Chen
4ff0b10435 Merge pull request #2103 from dongluochen/bump-v1.2.0-rc3 
Bump version to v1.2.0-rc3
 2016-04-08 15:10:47 -07:00
Dong Chen
621cf86cfb Bump version to v1.2.0-rc3 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-04-08 14:54:53 -07:00
Victor Vieux
6404badef1 Merge pull request #2102 from nishanttotla/fix-httpclientandscheme-signature 
Returning and handling error from HTTPClientAndScheme
 2016-04-08 14:37:00 -07:00
Nishant Totla
1dee9cb3f0 Returning and handling error from HTTPClientAndScheme 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-04-08 13:36:06 -07:00