centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-13 23:06:15 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,656 Commits 58 Branches 28 Tags
6a0bf552e343eda747d0fd4e69d88cbf07c62ec2
Commit Graph

1656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux
6a0bf552e3 Merge pull request #859 from docker/jimenez-typo-in-warning 
Update manage.go
 2015-05-26 18:08:03 -07:00
Isabel Jimenez
ebbeeba070 Update manage.go 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-05-26 21:06:12 -04:00
Victor Vieux
4f06657814 Merge pull request #857 from vieux/mesos_experimental 
add warning and rename flag
 2015-05-26 17:17:30 -07:00
Victor Vieux
9ff9bd16ae add warning and rename flag 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-26 17:03:08 -07:00
Victor Vieux
67122a68e5 Merge pull request #845 from docker/mesos 
[EXPERIMENTAL] Adding Mesos support
 2015-05-26 16:53:25 -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
44d7437ef0 Merge pull request #849 from abronan/cas_return_last_index 
Return last index on CAS operation
 2015-05-26 15:57:20 -07:00
Andrea Luzzardi
d4672005bf Merge pull request #852 from abronan/fix_zookeeper_watch 
Fix zookeeper watch that was triggered only once
 2015-05-26 15:23:47 -07:00
Alexandre Beslic
142030f65d Fix comment 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-26 15:03:03 -07:00
Andrea Luzzardi
fa2809d431 Merge pull request #841 from abronan/consul_ttl_check 
Additional check for ttl < 10s and Consul
 2015-05-26 15:00:22 -07:00
Alexandre Beslic
dedb0ed906 Fix zookeeper watch that was triggered only once 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-26 14:59:38 -07:00
Victor Vieux
62e46100cb Merge pull request #851 from aluzzardi/discovery-prefix 
discovery: KV Path is now an optional prefix.
 2015-05-26 14:57:56 -07:00
Andrea Luzzardi
1a58a85b44 discovery: KV Path is now an optional prefix. 
"consul://addr1" will store discovery entries into "docker/swarm/nodes"
"consul://addr2/foo" will store entries in "foo/docker/swarm/nodes"

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-26 14:25:23 -07:00
Isabel Jimenez
920897defb disable mesos in the cli 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-05-26 16:23:08 -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
Alexandre Beslic
814932ccb7 Simplify check 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-26 12:32:00 -07:00
Victor Vieux
1e44801ba6 Merge pull request #850 from vieux/file_watch 
Fix test for file watch
 2015-05-26 12:04:25 -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
be10798096 use proper append in test 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-26 11:49:36 -07:00
Victor Vieux
41c2060ab5 use heatbeat in second, not ms 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-26 11:19:04 -07:00
Alexandre Beslic
96241c6b79 pull out the log.Fatal from pkg/store to the discovery level 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-26 11:01:17 -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
Alexandre Beslic
1040ec06e4 Return last index on CAS operation 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-26 10:39:26 -07:00
Victor Vieux
59620bda11 Merge pull request #848 from vieux/health-unit-test 
Health unit test
 2015-05-26 10:27:47 -07:00
Victor Vieux
9c9adc59c0 use exported ErrNoHealthyNodeAvailable in tests 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-26 10:19:39 -07:00
Victor Vieux
ad8a9724e2 Merge pull request #835 from aluzzardi/leader-election 
Leader election
 2015-05-26 10:11:19 -07:00
Victor Vieux
e2ec55a845 Merge pull request #846 from rajdeepd/test-discovery 
Added TestCase for ContainsEntry
 2015-05-26 10:08:38 -07:00
Rajdeep Dua
46390b005f Added TestCase for ContainsEntry 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
 2015-05-26 03:29:59 -07:00
Alexandre Beslic
bf6427ad23 Additional check enforcing ttl >= 10s for Consul and ephemeral entries 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-25 12:36:27 -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
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