centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,494 Commits 57 Branches 28 Tags
8e7447c040275ed04e9dddcd3103ea36d6d0ac58
Commit Graph

1494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Beslic
8e7447c040 Merge pull request #779 from vieux/watch_varargs 
user varargs in store the watch callback
 2015-05-13 15:49:55 -07:00
Victor Vieux
0b45fa5154 user varargs in store the watch callback 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-13 15:42:44 -07:00
Victor Vieux
54dfabd252 Merge pull request #778 from mavenugo/store 
GetRange and WatchRange to return {key,value,index} tuple
 2015-05-13 15:14:28 -07:00
Madhu Venugopal
0130c2262d GetRange and WatchRange to return {key,value,index} tuple 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-05-13 11:24:03 -07:00
Victor Vieux
7dd0cde819 Merge pull request #766 from jimmyxian/update-readme 
update api README.md
 2015-05-12 15:46:08 -07:00
Victor Vieux
4bc58b1150 Merge pull request #756 from abronan/store_integration 
Change existing discovery backends to 'kv' using metatada storage backends in a new 'store' package
 2015-05-12 15:15:38 -07:00
Victor Vieux
a9eb48dcf2 Merge pull request #745 from aluzzardi/swarm-id 
Support for Swarm IDs
 2015-05-12 15:12:19 -07:00
Victor Vieux
d741a24887 Merge pull request #770 from aluzzardi/integration-constraints-debug 
integration: add debug to constraint
 2015-05-12 15:08:26 -07:00
Alexandre Beslic
2fc3f8e663 update README 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-12 15:06:57 -07:00
Andrea Luzzardi
f5ad970c87 integration: more debug into affinity 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-12 14:54:36 -07:00
Alexandre Beslic
06f51e09b0 revert variable names 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-12 14:47:48 -07:00
Alexandre Beslic
6b0b82cddc Add fixme related to timeout/heartbeat issue 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-12 14:41:09 -07:00
Andrea Luzzardi
bdd97c1d72 swarm id: Fix proxy for execs. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-12 14:21:09 -07:00
Alexandre Beslic
403f95f86c Remove placeholder TLS parameter in discovery interface and New method 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-12 14:19:30 -07:00
Andrea Luzzardi
b9cb4f4f35 integration: add debug to constraint 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-12 14:03:45 -07:00
Alexandre Beslic
6f67ca3a58 replace variadic method options for simple Config struct, correct Consul Watch method 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-12 14:00:55 -07:00
Alexandre Beslic
8909dfda63 Fix zookeeper watch methods with key being formatted twice before given to GetRange 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-11 19:07:21 -07:00
Xian Chaobo
a72d37be2d update api README.md 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-11 21:37:45 -04:00
Alexandre Beslic
e039563c78 Fix zookeeper timeout value 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-11 18:23:40 -07:00
Alexandre Beslic
d333da5284 remove log info for default case in SetOptions 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-11 17:49:40 -07:00
Alexandre Beslic
59e1e9b942 Change existing discovery backends to 'kv' using metatada storage backends in the store package 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-05-11 17:23:55 -07:00
Victor Vieux
38a1708e81 Merge pull request #754 from aluzzardi/jimmyxian-add-support-images-save 
Add support images save
 2015-05-11 17:16:36 -07:00
Andrea Luzzardi
dde47ee650 swarm IDs: Convert Swarm ID to Container ID in API Proxy. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:56:08 -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
b2fa060957 gitignore: Fix "swarm" pattern matching. 
The pattern without slashes was conflicting with cluster/swarm:

```
$ git add cluster/swarm/cluster.go
The following paths are ignored by one of your .gitignore files:
cluster/swarm
Use -f if you really want to add them.
fatal: no files added
```

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
c4c07c97ac godeps: vendor dependency to docker/docker/pkg/stringid. 
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
d88105dbfe integration: minor cleanup of docker save multi-images 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:44:15 -07:00
Andrea Luzzardi
9e2863ec71 api: getImages: changed error message 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:44:15 -07:00
Andrea Luzzardi
7403991cac API: Simplify getImages. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-11 16:44:15 -07:00
Xian Chaobo
42af0fadd7 fix var name and integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-11 16:44:15 -07:00
Xian Chaobo
3962f6ffdf add-support-images-save 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-11 16:44:15 -07:00
Victor Vieux
5b3a03b852 Merge pull request #759 from aluzzardi/integration-race-fixes 
integration: Fix API races related to delay in refresh.
 2015-05-11 16:09:46 -07:00
Andrea Luzzardi
abc5e4ebf1 Merge pull request #758 from chanwit/wait-for-zk-started 
integration: wait for zookeeper to start
 2015-05-11 15:44:59 -07:00
Andrea Luzzardi
7989a92161 Merge pull request #763 from snrism/etcd_discovery_test 
etcd Integration test
 2015-05-11 15:30:46 -07:00
Sriram Natarajan
e9f773f10f Etcd Integration test 
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
 2015-05-11 21:53:16 +00:00
Andrea Luzzardi
fdd3513cbf integration: check status with ps filter rather than inspect. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-09 16:33:57 -07:00
Andrea Luzzardi
a0973e6f91 integration: Fix pause test and make sure the cleanup is done properly. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-08 19:52:49 -07:00
Andrea Luzzardi
4bb035e41a integration: Fix API races related to delay in refresh. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-08 19:26:58 -07:00
Alexandre Beslic
be62f36215 Merge pull request #757 from aluzzardi/integration-race-fixes 
Integration race fixes
 2015-05-08 19:02:35 -07:00
Chanwit Kaewkasi
d0320d78a6 integration: wait for zookeeper to start 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-05-09 08:44:48 +07:00
Andrea Luzzardi
edb3504bc4 integration: affinities: add debug to help fix the test. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-08 18:23:52 -07:00
Andrea Luzzardi
c8f0fa545a integration: events: Fix race condition in tests. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-05-08 18:22:55 -07:00
Andrea Luzzardi
4e118defc2 Merge pull request #733 from snrism/consul_integration_test 
Integration test for consul discovery service
 2015-05-08 14:21:09 -07:00
Sriram Natarajan
63492feb3f Integration test for consul discovery service 
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
 2015-05-08 21:11:31 +00:00
Andrea Luzzardi
833377929b Merge pull request #750 from jimmyxian/fix-run 
Fix all api tests which do not need to use "run"
 2015-05-08 13:31:52 -07:00
Xian Chaobo
b986c151c5 fix all api tests which do not need to use run 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-07 22:07:34 -04:00
Andrea Luzzardi
f50dedee66 Merge pull request #747 from vieux/fix_flacky_rm_test 
fix flacky rm test
 2015-05-07 17:30:58 -07:00