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

438 Commits

Author SHA1 Message Date
Victor Vieux e52e14b499 Merge pull request #1242 from klaus1982/master 
correct mesos parameters
 2015-09-29 14:26:20 -07:00
Klaus Ma 63e86289cf correct mesos parameters 
Signed-off-by: Klaus Ma <klaus.ma@outlook.com>
 2015-09-29 13:56:41 +08:00
Daniel Nephin 605e528274 Improve the mesos addr error message 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-24 19:43:02 -04:00
Alexandre Beslic a792519978 Merge pull request #1208 from vieux/volume_create_delete 
docker volume create & docker volume delete
 2015-09-23 10:45:44 -07:00
Victor Vieux 53357d88fd Merge pull request #1213 from jimmyxian/fix-import-load-return-code 
Fix import/load return code
 2015-09-21 17:13:07 -07:00
Victor Vieux 79d1ee4861 add volume create 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-18 03:23:22 -07:00
Victor Vieux 440a379860 docker volume rm 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-18 03:22:57 -07:00
Xian Chaobo 9afb7d324b fix connect event 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-09-17 05:18:42 -04:00
Xian Chaobo 5cc6e3f30c fix import/load return code 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-09-15 10:00:49 -04:00
Xian Chaobo a10a39c462 fix pull return code 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-09-10 04:10:28 -04:00
moxiegirl c36dd9c1df Merge pull request #1184 from ahmetalpbalkan/mesos-docs 
docs: Clarify mesos driver, also line-wrapping
 2015-09-09 17:12:24 -07:00
Ahmet Alp Balkan a7d8d2fcbf docs: Clarify mesos driver, also line-wrapping 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-09-09 09:54:58 -07:00
Victor Vieux 77c96908f0 add support for docker volume ls & inspect 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-05 07:56:22 -07:00
Victor Vieux d571b7e39e Revert "prevent double starts with mesos" 
This reverts commit 9a93dcf46b.

Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-09-02 20:33:49 -07:00
Chanwit Kaewkasi 987dc06365 Merge pull request #1168 from abronan/fix_refresh 
Fix panic on Container/Image refresh after Engine removal
 2015-09-03 13:16:40 +07:00
Chanwit Kaewkasi 4cdbe875b8 Merge pull request #1155 from vieux/fix_mesos_logs 
prevent double logs with mesos
 2015-09-03 13:10:52 +07:00
Alexandre Beslic a7303ecc5e Fix panic on various calls when assigning Engine client to nil 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-09-02 09:41:51 -07:00
Victor Vieux 2fb43773cf Merge pull request #1180 from abronan/clean_state 
Cleanup state folder with local file persistence
 2015-09-01 17:04:28 -07:00
Victor Vieux 42bb1f3f5b Merge pull request #1159 from jimmyxian/fix-tag-images 
fix tag image
 2015-09-01 11:25:48 -07:00
Victor Vieux 9a93dcf46b prevent double starts with mesos 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-31 22:52:43 -07:00
Xian Chaobo 29df83a349 fix tag image 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-08-31 07:17:30 -04:00
Alexandre Beslic 6c1c83f7a3 Cleanup state folder with local file persistence (not used anymore) 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-08-30 17:15:52 -07:00
Xian Chaobo 12e956e681 add support force remove images 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-08-19 23:09:02 -04:00
Xian Chaobo 98178f3c41 Merge pull request #1152 from vieux/enable_better_refresh_mesos_0.23 
enable better refresh with mesos 0.23
 2015-08-15 15:50:41 +08:00
Victor Vieux 58482a13d2 enable better refresh with mesos 0.23 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-14 17:11:19 -07:00
Victor Vieux cc7b9b2176 add container name in mesos task label 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-14 13:48:49 -07:00
Xian Chaobo d4daee4f27 add support images -a 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-08-12 07:39:11 -04:00
Victor Vieux d5c41a38c1 update tests 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-10 23:09:52 -07:00
Victor Vieux 2a70ff3e1f display only containers created by swarm in mesos 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-08-10 22:51:39 -07:00
Andrea Luzzardi b32f0da81d Merge pull request #1127 from chanwit/natural-sort 
Natural sorting for Engine names
 2015-08-07 17:36:08 -07:00
Veres Lajos 0d94d7a11a typofix - https://github.com/vlajos/misspell_fixer 
Signed-off-by: Veres Lajos <vlajos@gmail.com>
 2015-08-07 23:06:16 +01:00
Chanwit Kaewkasi 974a482d16 implemented naturalsorter for engine 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-08-06 11:35:49 -04:00
James Wang Yong Qiao 88bbdff2e0 Fix the spell error. 
Signed-off-by: James Wang Yong Qiao <jamesyongqiao@gmail.com>
 2015-08-05 02:44:31 -04:00
Andrea Luzzardi 3bb4373f9f Merge pull request #1111 from vieux/no_json_manual 
do not generate JSON by hand
 2015-08-04 15:30:30 -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
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
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
Victor Vieux 7ec33a81b5 do not generate JSON by hand 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-30 18:10:13 -07: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 39309f7a62 rename n to e 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-16 11:55:33 -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 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
Alexandre Beslic 1a5881ec49 Merge pull request #971 from jimmyxian/reschedule-with-image 
Reschedule with soft image affinity
 2015-07-13 09:11:18 -07:00
Victor Vieux 49d475228e use docker_port from offer is present 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-07 13:37:33 -07:00
Victor Vieux b18b5bf9f7 add mesos tests back 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-07 13:27:40 -07:00
Victor Vieux 28c62b1fcf Merge pull request #1017 from vieux/hostname_mesos 
override hostname in mesos
 2015-07-09 14:14:55 -07:00
Peeyush Gupta fa0cc6d1df Fixing spelling of again 
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
 2015-07-07 11:09:39 +05:30
Xian Chaobo 0037c31a95 fix func name and use extracExprs 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-07-07 11:30:26 +08:00
Victor Vieux edb72d0744 always override hostname in mesos 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-06 17:35:53 -07:00
Ahmet Alp Balkan 6113e89004 Use os.Unsetenv in options_test 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-07-01 20:25:52 -07:00
Victor Vieux 895d820774 Merge pull request #964 from jimenez/task_timeout_flag 
making task timeout configurable
 2015-07-01 16:51:33 -07:00
Isabel Jimenez 305050025c making task timeout configurable 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-07-01 18:58:17 -04:00
ealang 15fc8d8210 Prevent panic if a container is removed during a refresh 
If InspectContainer fails, Engine.containers gets set to nil.

Log cause of updateContainer failure.

Signed-off-by: Eric Lang <ealang@gmail.com>
 2015-06-29 22:04:15 -05:00
Isabel Jimenez d86ab642fb adding implementation for TotalMemory and TotalCpus 
Signed-off-by: Isabel Jimenez <contact.isabeljimenez@gmail.com>
 2015-06-15 21:05:27 -04:00
Xian Chaobo 05ba86d329 golint and add integration test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-06-16 08:46:17 +08:00
Xian Chaobo 8cd667e996 add unit test for AddSoftImageAffinity 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-06-16 07:52:53 +08:00
Xian Chaobo 8c7c0b248b reschedule with soft image affinity 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-06-16 07:52:00 +08:00
Andrea Luzzardi 82fc920e90 Engine: fix panic in disconnect with events. 
Replaces #937

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-06-12 18:51:05 -07:00
Victor Vieux 53e88f3712 Merge pull request #933 from vieux/support_1.6.x+ 
Support 1.6.0+
 2015-06-12 15:58:52 -07:00
Victor Vieux 1afc1be2d1 support only 1.6.0+ 
update test/regression/run.sh
uddate doc
update tests

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-12 13:27:15 -07:00
Victor Vieux bc418df194 Merge pull request #936 from vieux/getting_started_mesos 
add very simple getting started for mesos
 2015-06-12 13:07:11 -07:00
Victor Vieux 3f0c3bc1c7 add getting started mesos 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-12 11:49:41 -07:00
Victor Vieux 4f688db989 disconnect on duplicate 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-11 15:09:37 -07:00
Victor Vieux c44151ff4a pretty print mesos offers 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-09 17:30:14 -07:00
Victor Vieux 12dac7560a fix lock in cluster.go 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-09 12:18:38 -07:00
Victor Vieux 3a1df50ed5 improve locks in queue.go 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-09 11:43:21 -07:00
Andrea Luzzardi 47dbb5a30d Merge pull request #902 from vieux/improve_docker_info 
Improve docker info against 1.7
 2015-06-05 15:52:13 -07:00
Marco Mancini 9e27ae9140 Fix reserved cpus computation 
Added test as Vieux suggested/Fixed CpuShare computation

Signed-off-by: Marco Mancini <marcomancini72@gmail.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 18:59:15 -07:00
Victor Vieux c1020da636 nits 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 18:25:51 -07:00
Victor Vieux 4f9c9f5867 use dockerclient structs 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 18:25:51 -07:00
Victor Vieux 2bf6c1a529 improve docker infi with 1.7 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 18:25:51 -07:00
Victor Vieux 15a8b73ab6 fix cpus 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 17:26:32 -07:00
Victor Vieux 4212b69c96 use inspect sent by mesos 0.23 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 14:42:37 -07:00
Victor Vieux e8445ed8ce fix panic is disconnect 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-04 11:27:17 -07:00
Victor Vieux 83f97f73e8 Merge pull request #886 from vieux/add_resources_test 
fix resources in docker 1.7
 2015-06-02 16:15:12 -07:00
Victor Vieux 7604d1cc30 add test 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-02 16:03:37 -07:00
Victor Vieux e8e9d553a2 handle compat 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-02 15:39:12 -07:00
Andrea Luzzardi e0188d8b66 Merge pull request #873 from jimmyxian/add-load-unit-test 
Add load unit test
 2015-06-01 15:43:08 -07:00
Andrea Luzzardi 0e32d052cf Merge pull request #878 from chanwit/private-reg-tag 
fix matching image name with private repo
 2015-06-01 15:35:45 -07:00
Chanwit Kaewkasi 7725b572c2 refactor parsing to a function 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-06-01 00:43:52 +07:00
Chanwit Kaewkasi 2701342a0c fix matching image name with private repo 
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
 2015-05-31 21:01:00 +07:00
Xian Chaobo 78957d527b add load unit test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-29 22:44:27 -04:00
Xian Chaobo def00ea0a0 fix load 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-29 22:35:27 -04:00
Victor Vieux ec784bd100 add initial version of mesos/cluster_test.go 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-29 15:07:04 -07:00
Xian Chaobo 684b2802d7 add import in mesos 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-27 22:12:56 +08:00
Xian Chaobo d7001cac97 fix import unit test 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-27 22:11:05 +08:00
Xian 8da3de3cc4 add import unit test 
Signed-off-by: Xian <xianchaobo@huawei.com>
 2015-05-27 22:11:05 +08:00
Xian Chaobo 1f20358b5d add support import 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-05-27 22:11:03 +08:00
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
Andrea Luzzardi cd3a0f03fc container config builder: Make all modifications on a copy, never alter original. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-30 18:06:26 -07:00
Andrea Luzzardi 67fbac56a6 cleanup config asserts 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-30 15:35:46 -07:00
Victor Vieux f53b5df834 store constaints and affinities in labels 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-30 14:33:21 -07:00
Victor Vieux 6eceffacf9 use cluster.ContainerConfig 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-30 11:44:25 -07:00
Victor Vieux e5f4243dad support pulling private images from docker pull 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-28 11:17:44 -07:00
Xian Chaobo 40a3eb1aa1 fix return value 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-27 21:35:46 -04:00
Andrea Luzzardi 24396d8509 Merge pull request #669 from jimmyxian/improve-rename 
improve rename
 2015-04-27 12:39:48 -07:00
Xian Chaobo 3d2537eb84 move check into cluster and rename func 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-27 08:20:55 -04:00
Xian Chaobo b47e002e6c improve rename and update dockerclient 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-24 21:09:26 -04:00
Andrea Luzzardi d6011b4bc6 Merge pull request #609 from jimmyxian/add-support-imageload 
Add support "docker load" api
 2015-04-24 17:21:11 -07:00
Sriram Natarajan 9f29e95abc Add Node Labels to Cluster Info information 
Updates: docker info output and /info API
Check for labels in API integration tests

Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
 2015-04-21 20:30:19 +00:00
Xian Chaobo 5c068de28c add force-refresh when commit/tag/pull 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-20 02:45:06 -04:00
Xian Chaobo 0b44d9615b add force fresh images 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-19 23:02:26 -04:00
Xian Chaobo 59c5b6b317 use WaitGroup and move test in api.bats 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 22:10:39 -04:00
Xian Chaobo 6ad2a7847c stream load and output nothing if load successfully 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 21:50:46 -04:00
Xian Chaobo 34e0c78d1d gofmt check 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 21:50:46 -04:00
Xian Chaobo ccc32635d5 Add support Load Image 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-04-16 21:50:46 -04:00
Andrea Luzzardi 9ac7dd2402 Merge pull request #603 from vieux/add_build 
Proposal: Add build support on a random node
 2015-04-16 16:21:38 -07:00
Victor Vieux 05b01c7b43 forcerefresh after build and add test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-04-16 12:22:09 -07:00
Andrea Luzzardi 4db132e20e Merge pull request #594 from noxiouz/add_rlocks_to_swarm_cluster 
Add Rlocks to swarm cluster
 2015-04-16 12:20:58 -07:00
Victor Vieux d74e872952 add build 
improve random selection

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-16 12:19:09 -07:00
Victor Vieux 8506acbed2 fix proxyRandom even without container 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-16 12:17:38 -07:00
Andrea Luzzardi 442217d6dc Cleanup events handler. 
- Renamed Events() to RegisterEventHandler() in Engine.
- Added RegisterEventHandler() to the Cluster interface.
- Removed EventHandler requirement from swarm's Cluster constructor.
- Make API's events handler private.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-15 15:59:55 -07:00
Sriram Natarajan 49f644934c Improve Error message to show node's Name and IP 
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
 2015-04-14 11:27:02 -07:00
Sriram Natarajan b174aa26de Change heartbeat type to unsigned int 
Check if heartbeat value is greater than zero

Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
 2015-04-09 00:04:50 +00:00
Anton Tiurin 2b4bbf1ef2 [SwarmCluster] Add RLock to Cluster.Pull 
Use sync.WaitGroup (go-way) to wait for a collection
of pulling goroutines.

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
 2015-04-08 22:30:23 +03:00
Anton Tiurin b221baf4ed [SwarmCluster] Add RLock to Cluster.hasEngine 
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
 2015-04-08 22:25:54 +03:00
Anton Tiurin e66abdf7bb [SwarmCluster] Remove an extra RLock in Engine.Container 
Engine.Container uses an array of containers from Engine.Containers, which is
built under an internal RLock, so the external RLock is useless.
Also allocate enough memory for the array of containers (images).

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
 2015-04-08 00:41:28 +03:00
Victor Vieux 853aaf6027 nodes -> engines 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-07 11:46:33 -07:00
Victor Vieux 0c1782c7c0 fix proxyRandom and cleanup node -> engine 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-06 13:38:10 -07:00
Victor Vieux 1297a4cef2 transform node interface to engine struct 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-06 13:19:37 -07:00
Alexandre Beslic 88b69e0671 Merge pull request #573 from aluzzardi/container-update-fix 
Fix container update flow.
 2015-04-03 17:03:14 -07:00
Victor Vieux 820527be7e Sort docker info by name 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-03 16:37:27 -07:00
Andrea Luzzardi 23d52249fa Fix container update flow. 
This guarantees that containers get fully updated before being inserted
in the node (and returned by .Containers()).

Fixes #560

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-04-03 16:21:48 -07:00
Victor Vieux 20ec7a889e add strategy and filters to docker info 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-03 15:56:26 -07:00
Victor Vieux c41d73dd50 add error message 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-04-03 01:28:08 +00:00
Victor Vieux 58b282a4a3 Merge pull request #545 from aluzzardi/synchronous-creater-destroy 
Make container creation and destruction synchronous.
 2015-04-01 15:41:26 -07:00
Victor Vieux b304a453f4 use 1024 as total cpushare for a machine 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-04-01 11:49:00 -07:00
Andrea Luzzardi ca05173e41 Make container creation and destruction synchronous. 
This is in order to fix race conditions. Currently, container creation
can happen in parallel which means that the scheduler operates on stale
data.

Fixes #427

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-03-31 14:11:51 -07:00
Matt Bajor d87c48ae4e Fix lint violations 
This changeset fixes all lint violations that show up with a
min_confidence of 1

- Issue #500: Run golint on codebase

Signed-off-by: Matt Bajor <matt@notevenremotelydorky.com>
 2015-03-27 21:17:44 -06:00
Alexandre Beslic 904c720ea5 Merge pull request #446 from vieux/rmi 
add docker rmi
 2015-03-24 16:04:35 -07:00
Victor Vieux 64d01b4e4a add fixme 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-03-19 10:02:33 -07:00
Victor Vieux e6b3b04150 do not leak dockerclient 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-03-18 13:48:09 -07:00
Victor Vieux c969fcdae6 use dockerclient 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-17 17:41:46 -07:00
Victor Vieux b4a88ad622 Add match in images.go 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-17 17:41:46 -07:00
Victor Vieux 649b6cf577 add docker rmi 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-17 17:41:46 -07:00
Victor Vieux 8c09bba1de mitigate race in pull while we wait for a proper store 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-17 23:29:42 +00:00
Victor Vieux b9e600d38d pull only latest if no tag 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-03-17 16:19:35 -07:00
Victor Vieux de62579f8d handle errors in pull 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-11 14:34:47 -07:00
Victor Vieux 0fca58b069 add Node back to inspect 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-06 16:40:55 -08:00
Victor Vieux 0e7f970d4d use a single callback 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-06 11:22:14 -08:00
Victor Vieux e0fa132ec9 add parallel 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-05 17:09:08 -08:00
Victor Vieux 7ad8a3705f add support for pull and rmi 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-05 17:09:08 -08:00
Victor Vieux eccaf6e5eb Cleanup: Make swarm Node and Cluster functions private 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-05 11:53:40 -08:00
Victor Vieux 0569f7d4dd swarm.Node -> swarm.node && some method now private 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-02 18:02:31 -08:00
Victor Vieux 92ab1e347c cleanup swarm scheduler code 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-03-02 17:55:06 -08:00
Victor Vieux 8b7afe2c73 remove mesos.go to move it to it's own PR 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-27 14:25:50 -08:00