Commit Graph

114 Commits

Author SHA1 Message Date
Andrea Luzzardi
9d3dd85cf1 fix master
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 00:16:05 -07:00
Victor Vieux
cf0098ae40 Merge pull request #691 from aluzzardi/container-config
Embed ContainerConfig into Container
2015-05-05 23:51:18 -07:00
Victor Vieux
9d267e5285 fix affinities.bats
and add affinity_test.go

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-05 17:58:13 -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
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
dce5d6fbba add a few expr tests
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-27 10:10:22 -07:00
Victor Vieux
77f0ac919a update doc
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-27 09:51:09 -07:00
Victor Vieux
28a358d9b2 use docker 1.6, add affinity tests and add doc
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-23 16:10:34 -07:00
Victor Vieux
f388d700fe use label as affinity
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-23 15:43:17 -07:00
Victor Vieux
2cb9b8e6fb Merge pull request #648 from liubin/fixtypos
fix some typos in source code
2015-04-20 12:16:19 -07:00
bin liu
413e93ed76 fix some typos in source code
Signed-off-by: bin liu <liubin0329@gmail.com>
2015-04-20 03:27:48 +00:00
Yucong Sun
eab732b8da Clarify support for filtering with Node ID and Node Name
Signed-off-by: Yucong Sun <sunyucong@gmail.com>
2015-04-19 05:43:01 +08:00
Andrea Luzzardi
2bfe3a68e3 Updated dockerclient and fixed API changes.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 14:32:51 -07:00
James Turnbull
658c807eb9 Did a quick pass on the docs to fix numerous formatting, spelling and grammar errors
Signed-off-by: James Turnbull <james@lovedthanlost.net>
2015-04-14 11:59:50 -04:00
Chanwit Kaewkasi
074b90c2a4 fix #589 - allow pipe in constraint regexp
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-14 02:25:54 +07:00
Chanwit Kaewkasi
8bac536980 fix test case per refactoring
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 01:23:34 +07:00
Chanwit Kaewkasi
1fd19c41ef update port filter document for host mode
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:32:13 +07:00
Chanwit Kaewkasi
83848918da add test case for the host mode
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:32:11 +07:00
Chanwit Kaewkasi
6102c1d357 add port filter for the host mode
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
2015-04-10 00:32: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
Victor Vieux
805b4763f4 disable cluster flag
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-03 16:33:48 -07:00
Victor Vieux
8f50c0eb7a use names everywhere
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-03 16:22:56 -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
Sriram Natarajan
6c1eeef280 Update Filters README with dependency filter link
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-01 12:17:25 -07:00
Sriram Natarajan
538e2f5b7e Validate value by checking for whitespace in constraint expression
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-03-31 00:21:19 -07:00
Sriram Natarajan
8a71a1d114 Fix 404 Error in Filter and Strategy README files
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-03-30 23:30:52 -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
smothiki
b91fa60246 Modify documentation for soft constraints
Signed-off-by: sivaram mothiki <sivaram@opdemand.com>
2015-03-23 11:22:21 -06:00
smothiki
cfbbb0c9cb Add support for soft constraints
Signed-off-by: sivaram mothiki <sivaram@opdemand.com>
2015-03-23 11:22:21 -06:00
smothiki
f9e82918b7 Add isSoft bool in type expr
Signed-off-by: sivaram mothiki <sivaram@opdemand.com>
2015-03-23 11:22:21 -06:00
smothiki
dd78f41c32 modify documentation for the sofaffinity example
Signed-off-by: sivaram mothiki <sivaram@opdemand.com>
2015-03-23 11:22:21 -06:00
smothiki
204216f173 Add support for soft affinities
Add documentation for soft affinity

trim ~ if the expression is not regex

Add example for !=~

Signed-off-by: sivaram mothiki <sivaram@opdemand.com>
2015-03-23 11:22:20 -06:00
Nicolas Jouannem
cb3f330696 Corrected two typos.
Signed-off-by: Nicolas Jouannem <nick@nickology.com>
2015-03-21 21:28:07 +01:00
Abdul Qabiz
918b762030 Fix typos
Signed-off-by: Abdul Qabiz <abdul.qabiz@gmail.com>
2015-03-17 06:46:20 +05:30
lalyos
308876e3c0 Make sample docker ps output fit the screen
The usual `docker ps` output is way long. When reading it on github there is no sign that the reader should
scroll. created and status fields deleted, and some space to make it fit the browser.

Signed-off-by: lalyos <lalyos@yahoo.com>
2015-03-09 20:14:36 +01:00
Victor Vieux
d8042f9677 add Node interface
Usable -> Total & Reserved -> Used

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:25:50 -08:00
Victor Vieux
47e03120f5 remove Nodes(), add Images() and Images()
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux
ce98e66c63 cluster API instead of scheduler API
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux
eb88068f93 refactor code: move filter/ and strategy/ out of scheduler and create a simple
scheduler interface.

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Sven Dowideit
c530cd1523 add an index and go make some small tweaks
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:19:14 +10:00
Andrea Luzzardi
97334b0193 Dependency Filter: co-schedule dependent containers on the same node.
Supported dependencies:
- Shared volumes: `--volumes-from=dependency`
- Links: `--link=dependency:alias`
- Shared network stack: `--net=container:dependency`

Fixes #251

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-02-10 13:26:21 -08:00
Derek Schultz
7709691f0b correct typo
Signed-off-by: Derek Schultz <schultz.derek@gmail.com>
2015-02-10 01:27:33 -07:00
zhangbaitong
3c10270289 Docs:fix the problem of logic in filter section
Signed-off-by: zhangbaitong <zhangbaitong@163.com>
2015-02-07 14:35:49 +08:00
Sven Dowideit
f8dc6e3f73 fix 2 broken links - there's no strategy README yet, so we can't link to it in the Docker docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-04 13:04:15 +10:00
Victor Vieux
3926582d7d add README.md for strategies
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-03 22:48:45 +00:00
Sven Dowideit
14c4fb81cf Add docker.docker.com metadata and reflow to 80-chars for GH diffs
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
2015-02-02 09:53:43 +10:00
Andrea Luzzardi
51e89bc928 constraint filter: Simplify code.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 15:35:40 -08:00
Andrea Luzzardi
df4ffb5a7b affinity: Ensure affinities can be chained.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 12:16:23 -08:00
Andrea Luzzardi
04fc1ab997 expr: Get rid of MatchEmpty.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-28 12:12:09 -08:00