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

1945 Commits

Author SHA1 Message Date
Andrea Luzzardi add72eb06a Merge pull request #1078 from abronan/leader_election_retry 
Leadership: Fault tolerant Leader Election mechanism
 2015-08-04 11:52:56 -07:00
Victor Vieux 2606db4486 Merge pull request #1085 from jimmyxian/improve-build 
Improve build
 2015-08-04 11:44:17 -07:00
Xian Chaobo a3cf5b9e9c improve build 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-08-04 02:45:06 -04:00
Andrea Luzzardi 60dc3099f4 Merge pull request #1082 from polyverse-security/mborsa_create_container_nil_pointer 
Avoid nil pointer dereference in (*Cluster).createContainer
 2015-07-31 16:44:46 -07:00
mariusz 2605d398b6 Updated the identifier as requested by @aluzzardi 
Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
Tickle Jenkins
 2015-07-31 16:32:12 -07:00
Alexandre Beslic 30f3a32989 Merge pull request #1112 from vieux/fix_stats 
fix stats test
 2015-07-31 13:00:58 -07:00
mariusz e1daa7c47b Error from Engine when refresh doesn't pickup new container 
Fix for https://github.com/docker/swarm/issues/1081
    Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
 2015-07-31 11:21:24 -07:00
mariusz 9dc65ca480 Avoid nil pointer dereference in (*Cluster).createContainer 
Swarm.Create car return nil,nil when refresh fails
due to network hiccup

Signed-off-by: Mariusz Borsa <mborsa@polyverse.io>
 2015-07-31 11:21:24 -07:00
Alexandre Beslic c7513506be Fault tolerant Leader Election process, fixes leader information on docker info, fixes intermittent error on Consul session lock 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-07-31 10:06:47 -07:00
Victor Vieux d594680e4f fix stats test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-30 21:22:44 -07:00
Andrea Luzzardi 95c4c9467e Merge pull request #1109 from vieux/switch_to_overlay 
fix CI
 2015-07-30 15:16:10 -07:00
Victor Vieux 69d2f40ded Merge pull request #1103 from aluzzardi/maintainers-file 
Add MAINTAINERS file.
 2015-07-30 14:46:16 -07:00
Victor Vieux b8f50bbf1f disable mesos tests again 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-30 14:09:18 -07:00
Andrea Luzzardi 99b94a1c91 Add MAINTAINERS file. 
Fixes #484

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-07-29 18:16:47 -07:00
Alexandre Beslic 5f207e6fe9 Merge pull request #1101 from alexwlchan/master 
Fix a pair of typos in the docs
 2015-07-29 10:57:20 -07:00
Victor Vieux c5e3b56653 Merge pull request #1102 from FreedomWangLi/master 
Spelling mistakes
 2015-07-29 10:51:06 -07:00
FreedomWangLi 102d8cbe58 Spelling mistakes 
There is a spelling mistake in the leadship pachage,
fix it in this patch.

Signed-off-by: Yong Qiao Wang <yqwyq@cn.ibm.com>
 2015-07-29 10:12:33 -04:00
Alex Chan a27c2e2d43 Fix a pair of typos in the docs 
Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
 2015-07-29 13:53:13 +01:00
Victor Vieux 97f55ad610 Merge pull request #1098 from aluzzardi/leadership-integration 
Leadership: integration tests
 2015-07-28 23:37:48 -07:00
Andrea Luzzardi cafca42239 Integration test for leader election 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-07-28 18:26:52 -07:00
Andrea Luzzardi 22dcdc245d integration helpers: Allow to run multiple managers. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-07-28 18:26:17 -07:00
moxiegirl 2a9503e449 Merge pull request #1073 from moxiegirl/remove-boot2docker-1072 
Fixes #1072 replacing boot2docker references
 2015-07-27 18:39:47 -07:00
Andrea Luzzardi c82a953422 Merge pull request #1080 from vieux/add_changelog 
add CHANGELOG.md
 2015-07-21 17:54:32 -07:00
Victor Vieux 67cd9259eb Merge pull request #1071 from peggyl/fix-typos 
Fix scheduler typos and broken links
 2015-07-21 11:01:34 -07:00
Peggy Li 0572a6778c Fix 'Scheduler' typos and update User Guide link 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
 2015-07-20 20:41:33 -07:00
moxiegirl b2182d0809 Merge pull request #1074 from moxiegirl/update-docs-dockerfile 
Updating to use the new base
 2015-07-20 06:16:05 -07:00
Mary Anthony d6e433da2c Updating to use the new base 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-19 15:42:05 -07:00
Victor Vieux 5a217d6169 add new endpoints for docker cp 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-18 22:04:56 -07:00
Victor Vieux bcc28f658d disable docker attach websocket test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-18 21:48:05 -07:00
Victor Vieux fe4163148f fix docker wait test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-18 21:47:41 -07:00
Victor Vieux 05234232a3 switch tests to overlay 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-18 21:01:11 -07:00
Mary Anthony eb78d72ef0 Fixes #1072 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-17 16:45:57 -07:00
Victor Vieux 20c3a7810c Merge pull request #1035 from moxiegirl/fix-list 
Fixes 1021 by reformatting the list
 2015-07-17 11:05:42 -07:00
moxiegirl 8d8945061f Merge pull request #1068 from peggyl/update-github-links 
Update Github links to point to docker/swarm
 2015-07-17 10:50:02 -07:00
Mary Anthony 99fb28f7d3 Fixes 1021 by reformatting the list 
Changing front to frontend per vieux
Updating to get lists looking proper

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-17 09:47:10 -07:00
Peggy Li 2628b5510a Update Github links to point to docker/swarm 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
 2015-07-16 19:03:26 -07:00
Alexandre Beslic 729001c9b4 Merge pull request #1066 from vieux/n_engine 
rename n to e
 2015-07-16 11:57:27 -07:00
Victor Vieux 39309f7a62 rename n to e 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-16 11:55:33 -07:00
Victor Vieux 48115bce68 Merge pull request #1065 from vieux/random_port 
support docker run -p <port> in mesos (random)
 2015-07-16 11:45:17 -07:00
Victor Vieux 542620d60d support docker run -p <port> in mesos (random) 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-16 11:24:45 -07:00
Victor Vieux 1d8d00a55e add changelog 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-16 11:06:39 -07:00
Victor Vieux bfd3fdfa4c Merge pull request #1063 from peggyl/scheduler-strategy-godoc 
Add more meaningful godoc comments for the scheduler/strategy package
 2015-07-16 09:06:26 -07:00
Peggy Li 5d1ae7b674 Add more meaningful godoc comments for the scheduler/strategy package 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
 2015-07-16 02:06:04 -07:00
Alexandre Beslic 1ab4129df6 Merge pull request #1048 from aluzzardi/leader-prefix 
Leader Election: Use same path prefix as discovery.
 2015-07-15 21:14:00 -07:00
Alexandre Beslic 02ba1fad43 Merge pull request #1032 from vieux/fix_match_push 
fix image matching in push
 2015-07-14 17:02:01 -07:00
Victor Vieux 2037540728 Merge pull request #1059 from vieux/add_env_support_in_mesos 
add env support in mesos
 2015-07-14 15:43:17 -07:00
Victor Vieux 248370469f add hostname support 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-14 15:25:38 -07:00
Victor Vieux b3385caa4e add env support in mesos 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-14 14:47:47 -07:00
Victor Vieux ef2d11899a Merge pull request #1058 from vieux/add_events 
add events to mesos and a few tests
 2015-07-14 14:40:24 -07:00
Victor Vieux f00e6aa967 add events to mesos and a few tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-14 14:20:17 -07:00