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

2482 Commits

Author SHA1 Message Date
Daniel Nephin f432b63fe3 Updates to swarm filters documentation 
Support reloading of docs.

Adjust the titles in docs/scheduler.filter to be more descriptive.

Also moves the meta sections about constraints out from the container affinity section.

Add a note about stopped containers being used by filters to the docs.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-12-01 17:49:25 -08:00
Alexandre Beslic 4fdcd3f903 Merge pull request #1477 from vieux/update_compose_1.5.1 
update compose to 1.5.1
 2015-12-01 17:38:59 -08:00
Alexandre Beslic c5810d6a64 fix swarm license grant 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-12-01 14:14:22 -08:00
Victor Vieux d295d4b323 update compose to 1.5.1 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-12-01 02:27:50 -08:00
Victor Vieux f5d21c19db Merge pull request #1465 from mountkin/fix-1436 
fix the panic when "ps -a" with dead containers
 2015-11-30 14:54:47 -08:00
Victor Vieux de6383c4dd Merge pull request #1448 from jimenez/timeout_default 
Changing offers timeout default to prevent other frameworks starvation
 2015-11-30 14:35:09 -08:00
Victor Vieux b7ca0e7844 Merge pull request #1450 from jimenez/glog_enable 
Enabling glog for mesos
 2015-11-30 13:40:06 -08:00
Shijiang Wei 3f6182c384 fix the panic when "ps -a" with dead containers 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-11-30 22:16:43 +08:00
Alexandre Beslic d05c80c1ae Merge pull request #1459 from sandric/patch-1 
Update networking.md
 2015-11-29 01:25:50 -08:00
sandric f7e02d64ae Update networking.md 
Fix typos

Signed-off-by: sandric <kyrychenkoanton@gmail.com>
 2015-11-28 07:48:29 +02:00
Alexandre Beslic 2b1d392b8c Merge pull request #1454 from SvenDowideit/move-to-docs-base-latest 
Use FROM docs/base:latest again
 2015-11-26 15:49:36 -08:00
Alexandre Beslic 56e90a56dc Merge pull request #1453 from jimmyxian/fix-integration-test 
Fix CI
 2015-11-25 19:07:46 -08:00
Sven Dowideit b0705e56ee Use FROM docs/base:latest again 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-26 12:56:23 +10:00
Xian Chaobo b85c2a65c6 fix CI 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-11-26 10:49:08 +08:00
Victor Vieux 088ad94a61 Merge pull request #1447 from dongluochen/eventsConnection 
Close tcp connection when client stops '/events' request.
 2015-11-25 16:57:48 -08:00
Victor Vieux 24fc1b6909 Merge pull request #1451 from aluzzardi/parallel-affinity-fix 
Set labels for pending containers
 2015-11-25 15:19:58 -08:00
Alexandre Beslic e82752cace Merge pull request #1363 from dongluochen/refreshConfiguration 
add engine options for refresh interval
 2015-11-25 14:30:16 -08:00
Andrea Luzzardi 905a8c8e5a Add parallel label affinity integration tests. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-11-25 06:58:06 -08:00
Andrea Luzzardi 0961c1e48a Add parallel to integration test environment. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-11-25 06:57:51 -08:00
Andrea Luzzardi 9310a385af Set labels for pending containers. 
Fixes docker/compose#2447

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2015-11-25 06:56:57 -08:00
Andrea Luzzardi 58ee815ec2 Merge pull request #1432 from abronan/fix_ci 
Update docker version for swarm-test-env
 2015-11-25 15:23:53 +01:00
Isabel Jimenez 185a46481a Enabling glog for mesos 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2015-11-25 04:40:03 -05:00
Isabel Jimenez e71bda76f8 Improving error output for bad swarm mesos user 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2015-11-25 04:24:08 -05:00
Isabel Jimenez 484edd33cd Changing offers timeout default to prevent other frameworks starvation 
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
 2015-11-25 04:01:30 -05:00
Dong Chen 59a1f2427b Close tcp connection when client stops '/events' request. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-11-24 16:18:18 -08:00
Alexandre Beslic 1b2afce425 Merge pull request #1016 from dreilly1982/clarifyports 
Clairify port usage in multi-manager-setup.md
 2015-11-23 17:08:11 -08:00
Victor Vieux 11582f5008 Merge pull request #1358 from kynrai/patch-1 
Update for new nsqio image
 2015-11-23 16:33:29 -08:00
moxiegirl 8400fa1b1e Merge pull request #1371 from pwnall/image_docs 
Document filter usage in image building
 2015-11-23 10:58:52 -08:00
Victor Costan 94d84a618c Document filter usage in image building. 
Signed-off-by: Victor Costan <costan@gmail.com>
 2015-11-23 13:36:05 -05:00
Alexandre Beslic 3cc7a426e3 Merge pull request #1376 from bfirsh/fix-typo-in-docs 
Fix first sentence in docs
 2015-11-23 09:55:43 -08:00
Alexandre Beslic 62c5d4b47a Merge pull request #1392 from MHBauer/issue1367 
add newline to event json to match docker
 2015-11-23 09:54:00 -08:00
Andrea Luzzardi 08502d37fa Merge pull request #1433 from flx42/flx42-patch-1 
Fix typo in discovery documentation
 2015-11-23 16:30:27 +01:00
Alexandre Beslic c4f85c531a upgrade integration environment 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-11-22 15:31:57 -08:00
Alexandre Beslic bb26c7c164 replace deprecated --daemon flag by daemon when starting docker in test runner 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-11-22 14:58:44 -08:00
Alexandre Beslic f2944386df Update Docker version in swarm-test-env Dockerfile 
Update the version of docker to 1.9.0 because of helpers
removal in hack/dind script that was mounting the cgroups.

It's now done automatically inside the containers as of
1.8.0.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-11-20 16:53:54 -08:00
Felix Abecassis 0b171c699a Fix typo in discovery documentation 
Signed-off-by: Felix Abecassis <felix.abecassis@gmail.com>
 2015-11-18 16:49:45 -08:00
Xian Chaobo d64a7a5f95 Merge pull request #1414 from vieux/event_delete 
fix event deletion under lock
 2015-11-19 08:43:28 +08:00
Dong Chen a150a0d521 Add cli test for engine refresh options 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2015-11-18 13:45:39 -08:00
moxiegirl 7504c5b866 Merge pull request #1431 from julienvey/typo_fix 
Fix typo in networking documentation
 2015-11-18 10:41:15 -08:00
Alexandre Beslic 5b714bd00a Merge pull request #1395 from jimmyxian/add-support-image-digest 
Add support do with image digest
 2015-11-18 09:38:24 -08:00
Julien Vey bb661212f9 Fix typo in networking documentation 
"use may use" => "you may use"
add missing s

Signed-off-by: Julien Vey <vey.julien@gmail.com>
 2015-11-18 17:57:47 +01:00
Morgan Bauer 99846a0b85
add newline to event json to match docker 
- docker server has a newline separating individual json entries
 - create const string for format
 - resolves #1367

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-11-15 14:14:02 -08:00
Victor Vieux 9ff2197596 fix event deletion under lock 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-11-14 19:35:15 +01:00
Alexandre Beslic 4dc83cc71b Merge pull request #1368 from abronan/configurable_discovery_path 
Add configurable discovery path option
 2015-11-11 15:32:05 -08:00
Xian Chaobo bea12ab8ab add support do with image digest 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-11-11 12:11:08 +08:00
Alexandre Beslic fe360978ac Merge pull request #1394 from abronan/fix_integration 
Fix integration tests, --exec-driver has been removed in docker master
 2015-11-10 09:36:16 -08:00
Alexandre Beslic 374370e39d fix integration tests, --exec-driver has been removed in docker master 
Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-11-09 09:34:37 -08:00
Victor Vieux 9ddb3c474c Merge pull request #1381 from auzias/master 
Fixed typos
 2015-11-05 00:28:26 -08:00
auzias 95c95812a6 Typos correction 
Signed-off-by: auzias <github@auzias.net>
 2015-11-05 08:41:45 +01:00
Alexandre Beslic 229b742570 Merge pull request #1377 from vieux/compose_1.5 
update compose to 1.5.0
 2015-11-03 17:14:58 -08:00