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

195 Commits

Author SHA1 Message Date
Victor Vieux 284ba144ed remove deadlock in mesos 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-26 19:34:54 -07:00
Andrea Luzzardi 0fb33f61d5 update testify 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-26 19:01:09 -07:00
Isabel Jimenez db7d918c0a Addressing review comments 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-05-26 19:45:10 -04:00
Victor Vieux 300932b2d5 add slave_test.go, add tast_test.go 
add basic network mode support

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Timothy Chen <tnachen@gmail.com>
 2015-05-26 16:22:34 -04:00
Isabel Jimenez 19c14fde2e Adding integration tests, decline offers after 'SWARM_MESOS_OFFER_TIMEOUT', Tracking tasks and managing offers, refactoring list of slaves, queue create requests before processing them 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-05-26 16:21:54 -04:00
Timothy Chen 20a5a7e588 Support port and address for Mesos. 
Signed-off-by: Timothy Chen <tnachen@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-05-26 16:19:08 -04:00
Isabel Jimenez 18235bee97 cluster mesos with engine 
Signed-off-by: Timothy Chen <tnachen@gmail.com>
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-05-26 16:18:33 -04:00
Victor Vieux 9db6bce98b Merge pull request #823 from vieux/containers 
create containers.go
 2015-05-26 13:05:26 -07:00
Victor Vieux b5094bde55 create Containers type 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-26 12:01:48 -07:00
Victor Vieux 0b24992d7c Merge pull request #815 from jimmyxian/rmi_by_name 
Fix image match
 2015-05-26 10:43:59 -07:00
Andrea Luzzardi b4efc08dfc api: Integrate leader election. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-22 21:23:34 -07:00
Andrea Luzzardi a3950e7f65 Merge pull request #796 from jimmyxian/refresh-container 
Add Refresh container
 2015-05-21 18:30:47 -07:00
Victor Vieux f7a49591a0 add getter/setter for namespaced labels 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-21 16:21:50 -07:00
Victor Vieux b3222a8f11 rename Destroy ro RemoveContainer for consistency 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-20 12:53:02 -07:00
Xian Chaobo e6ce59794e merge two image match func 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-19 21:39:10 -04:00
Alexandre Beslic 4537b9f2ba Remove unused code 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-19 12:57:43 -07:00
Alexandre Beslic f81de46ab4 Fix Consul and etcd with latest changes, use etcd v2.0.11 for integration tests, remove call to SyncCluster for now (breaks the integration tests) 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-19 10:25:31 -07:00
Alexandre Beslic d5915b2a09 Merge pull request #811 from aluzzardi/node-removal 
Handle Node Removal from Discovery correctly
 2015-05-19 10:11:10 -07:00
Xian Chaobo 064e91cd23 fix image match and fix docker save 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-19 05:21:14 -04:00
Isabel Jimenez 8001455ecf adding ip as an option for flags 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-05-18 20:34:57 -04:00
Isabel Jimenez 19d51f4a1a adding environment variable option when treating flags 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-05-18 20:16:21 -04:00
Andrea Luzzardi d7b8734e97 cluster: Handle node removal 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:55:13 -07:00
Andrea Luzzardi 7c0dba5de6 engine: Support for disconnection 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:55:13 -07:00
Andrea Luzzardi 3d6f833f6f fix --heartbeat flag. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:15 -07:00
Andrea Luzzardi 0c72bcaf40 discovery cleanup: heartbeat is a time.Duration. 
- Use a time.Duration instead of a uint64 for hb
- Flags can accept durations: --heartbeat 25s

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi f33c03af93 discovery: Push watch errors to a channel 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:14 -07:00
Andrea Luzzardi 97984881c3 discovery: New channel based API. 
- Watch() issues updates by channel rather than by callback
- Fetch() is gone
- Watch() can be stopped at any time by closing the stop channel
- Watch() is now resilient to errors and will try over and over

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-18 13:38:13 -07:00
Victor Vieux 4b03d7fa0c handle collision 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-18 13:35:33 -07:00
Victor Vieux faf26a62f4 fix container matching algorithm 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-15 17:57:40 -07:00
Victor Vieux 1f5d66d1f1 fix match 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-15 16:28:39 -07:00
Xian Chaobo 4af3e30f64 Fix:#748 add refresh container 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-15 04:46:02 -04:00
Victor Vieux 2cb0395acf remove images by name or ID, not always ID 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-14 15:22:06 -07:00
Andrea Luzzardi ece52698d6 Merge pull request #783 from vieux/fix_image_match 
fix image.Match to take only repo or repo:tag
 2015-05-13 19:05:30 -07:00
Victor Vieux f9b457f152 fix image.Match 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-13 17:36:08 -07:00
Victor Vieux 69bdf1a87b fix heartbeat default value 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-13 16:50:01 -07:00
Victor Vieux 59cd11b946 change swarm.heartbeat to swarm.discovery.heartbeat 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-13 15:48:07 -07:00
Victor Vieux 5db3a9cd0e remove options struct, yay! 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-13 15:36:30 -07:00
Victor Vieux c29404e272 add --cluster-driver and --cluster-opt 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-12 17:49:00 -07:00
Andrea Luzzardi b6a7c3d7f5 swarm ID: Remove backward compatibility. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:56:08 -07:00
Andrea Luzzardi 5c801d2c6a swarm id: Handle compatibility. 
Containers created with Swarm<0.3.0 or directly on the host without
going through Swarm don't have a Swarm ID. We are going to fake it by
using the Container ID.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:56:08 -07:00
Andrea Luzzardi abfe5e6f4c Add support for Swarm IDs. 
- Every container that gets created through Swarm gets a Swarm ID
  assigned (as a label).
- All API operations (start, stop, ...) can be performed by using either
  the container ID or the swarm ID.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:56:07 -07:00
Andrea Luzzardi 054702fedc container config: Add Swarm ID helpers. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:56:07 -07:00
Andrea Luzzardi 0bd4b1faca Merge pull request #732 from vieux/fix_name_unique 
fix name checks in create and rename
 2015-05-07 16:24:16 -07:00
Victor Vieux a74d00d1c5 fix name checks 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-07 15:50:34 -07:00
Andrea Luzzardi 5ee115fcd5 container: Use state strings from dockerclient instead of embedding 
them.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-07 15:42:26 -07:00
Andrea Luzzardi 8a00a5ff10 engine: Force full refresh when container changes state. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 23:38:32 -07:00
Andrea Luzzardi 4cf0a32e4d container: Add Status() and StateString() formatters. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-06 23:38:32 -07:00
Andrea Luzzardi 7865004ec9 Merge pull request #725 from aluzzardi/discovery-integration-cleanup 
Discovery integration cleanup
 2015-05-06 10:50:11 -07:00
Andrea Luzzardi 9124f3a0c7 cluster: Improved discovery duplication error messaging. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-05 19:13:57 -07:00
Andrea Luzzardi 1d2e073813 Embed ContainerConfig into Container. 
The cluster configuration is now embedded into the container. It's
guaranteed to be correct (as in, generated by BuildContainerConfig) at
all times.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-30 18:15:22 -07:00