microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
3 974 коммитов 243 Ветки 83 Теги 234 MiB
Граф коммитов

3974 Коммитов

Автор SHA1 Сообщение Дата
Victor Vieux e2ac0e6b80 add wait, stop, start, restart, rm, rmi 2013-11-11 14:47:23 -08:00
Guillaume J. Charmes 8149439d95
Make sure docker kill exit with failure in case of error 2013-11-11 09:15:51 -08:00
Guillaume J. Charmes 402a58a75a
Fix formatting in tests 2013-11-11 09:05:38 -08:00
Andy Rothfusz f26da9638f Merge pull request #2590 from metalivedev/2585-addphplib 
Fix 2585 and clean up warning in contributing.rst
 2013-11-08 15:35:24 -08:00
Guillaume J. Charmes 126b17a0ff Merge pull request #2615 from jpoimboe/ghost-networking-fix 
setup network when reconnecting to ghost container
 2013-11-08 15:31:55 -08:00
Andy Rothfusz 34d294c461 Fix 2585, rebase to master 2013-11-08 15:15:45 -08:00
Guillaume J. Charmes 3bbe8ee055 Merge pull request #2611 from seancron/changelog-edit 
Removes duplicate changelog entry
 2013-11-08 14:39:02 -08:00
Josh Poimboeuf 2448058ee2 setup network when reconnecting to ghost container 
Re-adding the line to setup the network when reconnecting to a ghost
container.  It was inadvertently removed by commit
31638ab2ad.
 2013-11-08 16:28:41 -06:00
Sean Cronin ca174ae84d Removes duplicate changelog entry 2013-11-08 17:17:39 -05:00
Victor Vieux f9dd0da182 Merge pull request #2610 from stapelberg/patch-1 
Return “err” instead of “nil” when MkdirAll() fails when binding a volume
 2013-11-08 14:00:06 -08:00
Michael Stapelberg e7fdcc15c5 Return “err” instead of “nil” when MkdirAll() fails when binding a volume 2013-11-08 22:52:10 +01:00
Andy Rothfusz 67b0b97a8f Merge pull request #2526 from metalivedev/2074-AddKnownIssues 
Add Known Issue
 2013-11-08 12:14:04 -08:00
Guillaume J. Charmes 310fbe7bb7 Merge pull request #2565 from danielnorberg/master 
lock around read operations in graph
 2013-11-08 09:34:18 -08:00
Michael Crosby 3f2a5912ee Merge pull request #2593 from dotcloud/2578 
Fix mergeConfig with new ports
 2013-11-08 09:23:06 -08:00
Michael Crosby 65102d6b36 Merge pull request #2597 from dotcloud/deprecate_separate_tag 
Deprecate old tagging format
 2013-11-08 09:15:47 -08:00
Michael Crosby 997a32706f Merge pull request #2599 from dotcloud/prevent_panic_wrong_api_use 
Prevent panic if you use API in a wrong way
 2013-11-08 09:09:03 -08:00
Guillaume J. Charmes 5cf6ad4565 Merge pull request #2584 from dotcloud/docker-ci 
docker-ci production sync
 2013-11-08 08:24:09 -08:00
Victor Vieux 49d7b87cfc prevent panic if you use API in a wrong way 2013-11-07 18:54:00 -08:00
Victor Vieux f417c4b099 Merge branch '1887-allow_ro_volumes-from' of https://github.com/daniel-garcia/docker into daniel-garcia-1887-allow_ro_volumes-from 2013-11-07 17:59:55 -08:00
Guillaume J. Charmes ef57752bce
Deprecate old tagging format 2013-11-07 17:30:51 -08:00
Guillaume J. Charmes 4f8b6c3283 Merge pull request #2348 from SvenDowideit/2328-docker-events-since-date-string 
Use string timestamp for docker events -since
 2013-11-07 15:47:41 -08:00
Sven Dowideit 01fea3cf11 Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user 2013-11-08 09:32:13 +10:00
Victor Vieux 49c4231f07 fix mergeConfig with new ports 2013-11-07 14:31:25 -08:00
Michael Crosby cd4f7321c9 Merge pull request #2589 from dotcloud/gofmt 
Go fmt
 2013-11-07 12:32:58 -08:00
Michael Crosby 132db329d4 Merge pull request #2591 from dotcloud/fix_Assign_id_as_name_when_all_else_fails 
Fix Assign id as name when all else fails
 2013-11-07 12:29:02 -08:00
Guillaume J. Charmes 6998c3c387
go fmt 2013-11-07 12:27:33 -08:00
Victor Vieux 26f846bf77 fix Assign id as name when all else fails 2013-11-07 12:23:29 -08:00
Andy Rothfusz 97c3de7e6b Fix 2585 and clean up warning in contributing.rst 2013-11-07 12:20:23 -08:00
Michael Crosby b5c984f9b4 Merge pull request #2561 from dotcloud/add_iptabled_errors 
Make iptable return an error in case of output
 2013-11-07 09:15:09 -08:00
Daniel Mizyrycki 249f76bebd docker-ci 0.4.5: Sync tests with progress in docker and docker-registry. Use revamped shiny DinD. 2013-11-06 20:05:26 -08:00
Daniel Mizyrycki e7df38dbd0 docker-ci 0.40. Migrate docker-ci to Digital Ocean. 2013-11-06 19:13:58 -08:00
Daniel Mizyrycki efb4c800a7 docker-ci 0.37. Patch hack/dind with latest code for docker-test. 2013-11-06 19:13:58 -08:00
Daniel Mizyrycki 0cbeda7391 docker-ci 0.36. Patch hack/dind with latest code for nightly release to work. 2013-11-06 19:13:58 -08:00
Daniel Mizyrycki 1717227636 docker-ci 0.35. Push docker coverage and testing into docker-ci production. Update docker nightlyrelease 2013-11-06 19:13:58 -08:00
Daniel Mizyrycki 50dd9791f7 testing infrastructure, issue #1800: Refactor docker testing using Docker in Docker 2013-11-06 19:13:58 -08:00
Andy Rothfusz 9990db2f5a Fix bold 2013-11-06 18:07:55 -08:00
andy diller 2d1155407a updated create, showing how to set expose port and bind to public port for ssh 2013-11-06 18:07:55 -08:00
Andy Rothfusz 37dcff0c13 Merge pull request #2557 from jamtur01/new_redis 
Updated Redis service example to use links. Removed "Linking Redis" example as redundant.
 2013-11-06 17:54:34 -08:00
Andy Rothfusz 38f1838e82 Merge pull request #2567 from mck-/patch-1 
Add -p when running the container (node example)
 2013-11-06 17:34:11 -08:00
Andy Rothfusz 807a305f36 Merge pull request #1794 from justone/add-images-tree 
add -tree option to images
 2013-11-06 16:12:36 -08:00
Victor Vieux cb1c90975b Merge pull request #2577 from dotcloud/bump_v0.6.6 
Bump v0.6.6
 2013-11-06 13:41:52 -08:00
Nate Jones 363738b8f2 updating cli help doc for images 2013-11-06 12:03:45 -08:00
Victor Vieux 360a694c52 Bump version to v0.6.6 2013-11-06 11:43:02 -08:00
Nate Jones 16eba6bbb5 fix /images/json doc for 1.7 2013-11-06 11:30:04 -08:00
Victor Vieux 0dd6c6645b Merge pull request #2568 from mrallen1/fix/1965 
See if a path exists before injecting Reader there
 2013-11-06 10:57:06 -08:00
Guillaume J. Charmes 45aba3dc95 Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change 
change ID to CONTAINER ID/IMAGE ID
 2013-11-06 09:45:23 -08:00
Guillaume J. Charmes c22ff0296e Merge pull request #1577 from mrallen1/fix/1502 
Prevent DNS server conflicts in CreateBridgeIface
 2013-11-06 07:52:50 -08:00
Guillaume J. Charmes 00f1398f7a
Add debug to iptables 2013-11-06 07:37:43 -08:00
Mark Allen 74f853a2ae See if a path exists before injecting Reader there 
Closes #1965
 2013-11-05 23:44:52 -06:00
Daniel Norberg 20881f1f78 gograph: allow Walk() reentrance 
Hold the read lock while reading the child graph,
then walk over the children without any lock, in
order to avoid deadlock.
 2013-11-06 00:18:45 -05:00