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

954 Commits

Author SHA1 Message Date
Andrea Luzzardi a445ed952e Merge pull request #365 from vieux/add_cpus_mem 
Add cpus mem
 2015-02-13 11:24:07 -08:00
Victor Vieux 14674b47ec Merge pull request #388 from aluzzardi/dependency-filter 
Dependency Filter: co-schedule dependent containers on the same node.
 2015-02-13 10:59:13 -08:00
Victor Vieux 95c4d97380 Merge pull request #397 from bacongobbler/395-correct-irc-channel 
correct IRC channel
 2015-02-13 10:54:22 -08:00
Matthew Fisher 96274a9567 correct IRC channel 
Signed-off-by: Matthew Fisher <matthewf@opdemand.com>
 2015-02-13 03:13:34 -07:00
Victor Vieux 12e1b047e7 Merge pull request #392 from aluzzardi/doc-fix-port-binding 
README: Fix port binding in example.
 2015-02-11 23:02:41 -08:00
Andrea Luzzardi 9f0d616273 README: Fix port binding in example. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-11 17:23:57 -08:00
Andrea Luzzardi 0bc7230120 Merge pull request #391 from JeffChien/update_consul_api 
Update consul api
 2015-02-11 11:22:21 -08:00
JChien 050c0572d2 update godeps 
Signed-off-by: JChien <jeffchien13@gmail.com>
 2015-02-11 21:26:44 +08:00
JChien a19fecee87 update import url 
Signed-off-by: JChien <jeffchien13@gmail.com>
 2015-02-11 21:25:55 +08:00
Andrea Luzzardi e6423f1aa4 Merge pull request #389 from vieux/update_testify 
update testify
 2015-02-10 16:45:31 -08:00
Victor Vieux ba7195c1e6 add number of container per node 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-10 23:21:17 +00:00
Victor Vieux 348bb1ee4c update testify 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-10 21:56:49 +00:00
Andrea Luzzardi 7b009d6d43 Merge pull request #381 from vieux/closeIdleConnections 
closeIdleConnections to prevent leaks with https
 2015-02-10 13:41:28 -08:00
Andrea Luzzardi 12c5bb172e docker-compose examples: Remove affinities. 
With the dependency filter, affinities are no longer required.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-10 13:26:21 -08: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
Andrea Luzzardi 67e347fa1a Move container name matching logic into Node. 
- Add `Node.Container()`
- Make `Cluster.Container()` use `Node.Container()`
- Added missing locks and converted existing ones to RLock.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-10 13:25:37 -08:00
Victor Vieux e256ef2b45 Merge pull request #367 from aluzzardi/docs-update-official-image 
Docs: Run swarm using the docker official image in the examples.
 2015-02-10 11:58:20 -08:00
Andrea Luzzardi df3a80db5b Merge pull request #384 from vieux/fix_port_filter 
fix port filter cli
 2015-02-10 11:56:25 -08:00
Victor Vieux f19c83e7e7 Merge pull request #385 from derekschultz/fix_typos 
correct typo
 2015-02-10 11:56:16 -08:00
Victor Vieux 3f625de35c show reserved resources 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-10 19:09:31 +00:00
Victor Vieux c7437c11cd add Godep 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-10 19:09:31 +00:00
Victor Vieux a51ec6a8b1 add CPUS, Total Memory in docker info 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-10 19:09:31 +00:00
Derek Schultz 7709691f0b correct typo 
Signed-off-by: Derek Schultz <schultz.derek@gmail.com>
 2015-02-10 01:27:33 -07:00
Victor Vieux 3c4cbf3a4b fix port filter cli 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-10 05:21:43 +00:00
Andrea Luzzardi 3de12b80c3 Merge pull request #364 from vieux/node_machine 
replace discovery.Node by discovery.Entry + small refactor
 2015-02-09 18:42:43 -08:00
Victor Vieux 3df8bbed61 refactor createEntries 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-10 02:25:38 +00:00
Victor Vieux ba01634743 replace discovery.Node by discovery.Entry 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-10 01:58:43 +00:00
Victor Vieux 7401789862 closeIdleConnections to prevent leaks with https 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-02-10 01:32:16 +00:00
Victor Vieux ea2a0386ae Update ROADMAP.md 2015-02-09 11:01:23 -08:00
Victor Vieux 1c1e758ea8 Merge pull request #379 from zhangbaitong/master 
Docs:fix the problem of logic in filter section
 2015-02-07 20:56:05 -08: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
Victor Vieux 36440405f4 Merge pull request #370 from zhangbaitong/master 
Docs:fix the problem of description in strategy section
 2015-02-05 17:45:43 -08:00
zhangbaitong 67f4fbb42a docs:fix the problem of description 
Signed-off-by: zhangbaitong <zhangbaitong@163.com>
 2015-02-06 09:38:13 +08:00
Victor Vieux 4ea8159735 Merge pull request #369 from mota/fix-exec 
Fix race condition on exec
 2015-02-04 17:35:35 -08:00
Pierre Wacrenier 16f5945439 Fix race condition on exec 
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
 2015-02-05 01:40:40 +01:00
Andrea Luzzardi 6ea7c707e9 Docs: Run swarm using the docker official image in the examples. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-04 15:45:45 -08:00
Victor Vieux e87c276c1e Merge pull request #366 from aluzzardi/tls-fix 
TLS Fixes.
 2015-02-04 14:30:17 -08:00
Andrea Luzzardi c2d7acf42a Fix --tlsverify between the CLI and Swarm. 
--tlsverify used to be effective only between Swarm and the engines, but
the authentication was not properly functioning with the CLI.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-04 13:14:05 -08:00
Andrea Luzzardi a0bfcf6733 Node: Connect with the provided address instead of resolving the IP. 
When used with `--tlsverify`, connecting with the IP forced daemon
certificates to use an IP in `subjAltName`.

Related to #341

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-04 13:10:27 -08:00
Andrea Luzzardi a48e905245 Merge pull request #358 from SvenDowideit/fix-links 
fix broken link in README
 2015-02-03 19:56:14 -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 532f5d7305 Merge pull request #361 from vieux/strategy_readme 
add README.md for strategies
 2015-02-03 18:42:46 -08: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
Victor Vieux d03c5bb211 Merge pull request #356 from aluzzardi/dockerfile-set-host 
Dockerfile: Set swarm to bind to all interfaces in container mode.
 2015-02-02 18:49:40 -08:00
Victor Vieux 6f45238f74 Merge pull request #357 from aluzzardi/default-swarm-addr 
Change default SWARM_ADDR to the default Docker port.
 2015-02-02 18:49:29 -08:00
Andrea Luzzardi 0bf7cc8c35 Change default SWARM_ADDR to the default Docker port. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-02 18:46:29 -08:00
Andrea Luzzardi 00b14527b5 Dockerfile: Set swarm to bind to all interfaces in container mode. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-02 18:44:22 -08:00
Andrea Luzzardi 2b2114e554 Merge pull request #308 from vieux/filter_swarm_containers 
Proposal: require ps -a to show swarm containers
 2015-02-02 18:32:12 -08:00
Victor Vieux 4c9935cd32 Merge pull request #355 from aluzzardi/doc-discovery-flag-fix 
Docs: Remove now deprecated `--discovery` flags.
 2015-02-02 18:18:36 -08:00
Andrea Luzzardi 2a592974a1 Docs: Remove now deprecated `--discovery` flags. 
Fixes #351

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-02-02 18:12:05 -08:00