Commit Graph

1822 Commits

Author SHA1 Message Date
Andrea Luzzardi d8a0ba5d88 api: Remove unused test.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-22 20:08:12 -07:00
Andrea Luzzardi bbf57d0724 leadership: API cleanup.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-22 20:08:12 -07:00
Victor Vieux 10a7abd89e Merge pull request #833 from abronan/docs_changes
Add example of secured setup using docker-machine, marks the manual setup as insecure
2015-05-22 14:55:30 -07:00
Victor Vieux 1ae90b679c Merge pull request #829 from moxiegirl/docs-uniformity
Reconfigure for documentation tooling
2015-05-22 14:54:20 -07:00
Mary Anthony 8719caa890 Reconfigure for documentation tooling
Signed-off-by: Mary Anthony <mary@docker.com>

Removing token per Victor

Signed-off-by: Mary Anthony <mary@docker.com>

Adding in PR comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-22 10:43:36 -07:00
Alexandre Beslic ebd7576e41 temporary fix on node/agent term usage, fix docker info example
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-22 10:24:07 -07:00
Alexandre Beslic 928beefe21 Add example of secured setup using docker-machine, marks the manual setup as *unsecure*
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-21 20:40:58 -07:00
Andrea Luzzardi b5c8062933 Merge pull request #825 from abronan/etcd_lock
store: Implement locking mechanisms with Etcd
2015-05-21 18:40:07 -07:00
Andrea Luzzardi 13e15ff2e4 Merge pull request #827 from abronan/zk_lock
store: Enhance zookeeper lock with value support
2015-05-21 18:38:15 -07:00
Alexandre Beslic 86b144859a Add FIXME for the leader value staying set although all machines are gone
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-21 18:30:54 -07:00
Andrea Luzzardi a3950e7f65 Merge pull request #796 from jimmyxian/refresh-container
Add Refresh container
2015-05-21 18:30:47 -07:00
Alexandre Beslic 45bd6f6815 Fix etcd Unlock that allowed other processes (non lock-holder) to unlock the key
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-21 18:27:54 -07:00
Victor Vieux b16b39ecb1 Merge pull request #832 from vieux/namespace_label
add getter/setter for namespaced labels
2015-05-21 16:25:05 -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 90251c050d Merge pull request #828 from jimenez/gopeds_for_mesos
Godeps for Mesos
2015-05-21 14:23:01 -07:00
Isabel Jimenez 376c4ff458 Godeps for Mesos
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
2015-05-21 15:39:25 -04:00
Alexandre Beslic 055551a0c8 Enhance zookeeper lock with value support
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-21 11:19:38 -07:00
Andrea Luzzardi 10bbbde6d0 Merge pull request #824 from mavenugo/master
Adding export Init method for the exported discovery components
2015-05-21 02:42:27 -07:00
Alexandre Beslic ff8f1b5fa8 Implement locking mechanisms with Etcd
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-21 01:15:14 -07:00
Madhu Venugopal 23ecada9d7 Adding export Init method for the exported discovery components
Since Swarm discovery is used by libnetwork without the swarm main(), it
is forced to use annonymous import in order to force-trigger the
unexported init() methods. Using annonymous import is highly discouraged
in a Non-Main and Non-Test packages.

Introducing exported Init() methods on these files so that libnetwork
can use Discovery as a library without having a main package.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-05-20 20:18:13 -07:00
Alexandre Beslic c1494dd076 Merge pull request #819 from aluzzardi/leadership
Leader Election
2015-05-20 14:16:23 -07:00
Andrea Luzzardi a81c5436bb leadership: Fix README
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-20 13:58:27 -07:00
Victor Vieux 53e3c5b05f Merge pull request #820 from vieux/rename_destroy
rename Destroy ro RemoveContainer for consistency
2015-05-20 13:29:21 -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
Victor Vieux 89d3c2a4cb Merge pull request #814 from jimmyxian/fix-bool-value
Fix #810 bool value
2015-05-20 10:09:11 -07:00
Andrea Luzzardi 3f01413b75 leadership: Distributed Leader Election
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-19 20:14:28 -07:00
Andrea Luzzardi 78839ba4ea store: Improved locking API and added mocks.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-19 20:14:28 -07:00
Andrea Luzzardi 2ff9679938 store: CreateStore -> NewStore
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-19 20:13:29 -07:00
Andrea Luzzardi 71a5fd944a Merge pull request #801 from abronan/add_ephemeral_support
store: Add node Ephemeral support
2015-05-19 20:13:06 -07:00
Xian Chaobo df50eb8c67 add unit test
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 21:54:03 -04: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 38f78b02b5 Reset ephemeral session on renewal failure
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 18:30:59 -07:00
Alexandre Beslic b8d72c291d Cleanup, fix Integration tests and use of a single global Session in Consul
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 15:27:39 -07: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 5d106186fb remove the periodic session renewal in Consul until we figure out what to do with etcd..
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 12:31:39 -07:00
Alexandre Beslic ec478d8ed5 Add integration tests for engines departure with node removal and ephemeral behavior
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 12:08:56 -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 4408a9cc8c Add Ephemeral for Consul, Zookeeper and Etcd (Etcd abd Consul are using TTLs in the background)
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
Xian Chaobo 24eb0adbb0 fix #810 bool value
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 04:01:41 -04:00
Victor Vieux 7b3c889407 Merge pull request #809 from jimmyxian/bugfix-volumes-from
fix #807: support --volumes-from rw/ro
2015-05-18 19:41:36 -07:00
Andrea Luzzardi 3c4b19ed26 Merge pull request #812 from docker/flag_to_env
adding environment variable option when treating flags
2015-05-18 19:08:53 -07: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 55c52f7a92 Merge pull request #799 from vieux/update_usage
update usage to look more like the engine/machine
2015-05-18 14:16:20 -07:00
Victor Vieux a43f10adc4 update usage to look more like the engine/machine
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-18 13:57:43 -07:00
Andrea Luzzardi dd48440d98 api: "Host Down" instead of "Pending" as a status
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00
Andrea Luzzardi 8c9449899b api: Log requests to debug level
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00
Andrea Luzzardi 7dec704b8a integration: node removal for file discovery
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:55:13 -07:00