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

2240 Commits

Author SHA1 Message Date
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
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
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
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
Victor Vieux f3bffb2dd9 update compose to 1.5.0 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-11-03 16:45:09 -08:00
Victor Vieux 087e2452f3 Merge pull request #1369 from vieux/fix_various_issues 
Fix various issues
 2015-11-03 00:35:11 -08:00
Victor Vieux c286a183b3 fix diff test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-11-02 18:03:29 -08:00
Victor Vieux 3b6d9b6820 monitor events just after the info 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-11-02 17:04:01 -08:00
Victor Vieux 3c397e5b96 update test name 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-11-02 16:32:43 -08:00
Victor Vieux 3f29299afd refresh volumes after creating a container 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-11-02 16:31:57 -08:00
Victor Vieux 0fa9b97f4e refresh images after a rmi 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-11-02 16:20:24 -08:00
Alexandre Beslic 8a2897e141 Add configurable discovery 
This PR allows to configure the discovery path using the
--discovery-opt flag (with "kv.path=path/to/nodes"). We
can point to "docker/nodes" and use the docker discovery.

If docker instances are advertising to the cluster using
the `--cluster-advertise` flag, the swarm join command
becomes unnecessary.

Signed-off-by: Alexandre Beslic <abronan@docker.com>
 2015-11-02 06:10:50 -08:00
Victor Vieux 830c612933 Merge pull request #1362 from jimmyxian/add-integraion-test 
Add integraion test for rmi -f with image tag
 2015-11-01 00:20:36 -07:00
Xian Chaobo 5aae69fc58 add integraion test for rmi -f with image tag 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-10-31 10:36:02 +08:00
Alexandre Beslic d395fa59a1 Merge pull request #1361 from vieux/improve_network_inspect_test 
ensure docker network inspect is the same as the engine one
 2015-10-30 15:19:13 -07:00
Alexandre Beslic cb7ddd1fcb Merge pull request #1359 from vieux/update_network_types 
update network types
 2015-10-30 14:51:15 -07:00
Victor Vieux 1c1a99038e ensure docker network inspect is the same as the engine one 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-30 00:38:42 -07:00
Victor Vieux a36a9b416c update network types 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-30 00:03:08 -07:00
Victor Vieux 0a8cf2cf06 Merge pull request #1355 from jimmyxian/fix-push-image 
fix push image
 2015-10-29 22:00:24 -07:00
Xian Chaobo 5d1fd77aea fix push image 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-10-29 20:41:28 +08:00
Victor Vieux d2c5446ea0 Merge pull request #1340 from jimmyxian/volume-driver 
Move VolumeDriver to HostConfig
 2015-10-28 15:28:53 -07:00
Alexandre Beslic e8dd274b65 Merge pull request #1342 from vieux/update_to_1.5.1 
switch to go1.5.1
 2015-10-28 11:47:11 -07:00
Victor Vieux 86816e7d44 Merge pull request #1287 from dnephin/fix_filter_images_by_repo 
Fix filter images by repo
 2015-10-27 21:33:25 -07:00
Xian Chaobo 0d0b99953e Merge pull request #1349 from vieux/add_file_back_to_test_env 
add file back to test env
 2015-10-28 12:14:28 +08:00
Victor Vieux 6e9362af50 add file back to test env 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-27 21:13:12 -07:00
Alexandre Beslic 6db3956c4a Merge pull request #1346 from vieux/fix_network_inspect 
fix network inspect via name for global scope
 2015-10-27 21:12:20 -07:00
Victor Vieux 479db2904f fix network inspect via name for global scope 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-10-27 20:40:13 -07:00
Xian Chaobo 588c29c3cc move VolumeDriver to HostConfig 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-10-28 10:58:24 +08:00
Daniel Nephin e001980b5c Add filter by image name support to /images/json 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-27 11:00:37 -04:00
Victor Vieux b924f7f8fa switch to go1.5.1 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-10-26 11:49:48 -07:00
Alexandre Beslic ae81ef652e Merge pull request #1338 from vieux/get_compiled_go 
fix test Dockerfile, use precompiled go
 2015-10-26 10:24:00 -07:00
Alexandre Beslic da1f854462 Merge pull request #1310 from pwnall/image_affinity 
Swarm filters support in image building
 2015-10-23 14:54:33 -07:00
Alexandre Beslic a7a82bd1ae Merge pull request #1330 from vieux/fix_mesos_timeout_issue 
fix issue with timeouts in mesos
 2015-10-23 14:13:14 -07:00
Alexandre Beslic b68183aabc Merge pull request #1335 from vieux/fix_panic 
fix panic when createContainer returns nil,nil
 2015-10-23 14:05:33 -07:00
Victor Costan e32b3211ae Swarm filters support in image building. 
When building an image (POST /build), swarm will extract filters from
buildargs. This is similar to how container creation (POST
/containers/create) extracts filters from environment variables.

Signed-off-by: Victor Costan <costan@gmail.com>
 2015-10-23 14:24:42 -04:00
Victor Vieux 5146f07b83 Merge pull request #1332 from riuvshin/master 
Fix log info message
 2015-10-23 10:20:18 -07:00
Roman Iuvshin 40a22e5a13 Fix log info message 
Signed-off-by: Roman Iuvshin <riuvshin@codenvy.com>
 2015-10-23 17:22:53 +03:00
Xian Chaobo 7510c12122 Merge pull request #1327 from vieux/return_200_image_create 
return 200 OK in /images/create
 2015-10-23 09:10:42 +08:00
Victor Vieux 2eb39be3ee Merge pull request #1329 from vieux/improve_mesos_error_message 
improve error message in mesos
 2015-10-22 16:59:00 -07:00
moxiegirl 756671ac66 Merge pull request #1324 from SvenDowideit/fix-errant-links 
Fix some non-relative links
 2015-10-22 09:29:32 -07:00