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

12291 Коммитов

Автор SHA1 Сообщение Дата
Jessie Frazelle b49d3dd588 Merge pull request #9779 from jfrazelle/9771-non-local-mac-address-test 
Add test for non local mac address.
 2014-12-26 19:33:44 -07:00
Alexander Morozov 819b715b8d Merge pull request #9792 from jfrazelle/9770-parse-exec-usage 
Return usage on parseExec error.
 2014-12-26 17:45:55 -08:00
Alexander Morozov bba3c14e2e Merge pull request #9825 from tianon/long-form-names 
Switch names-generator arrays to be long-form
 2014-12-26 16:13:48 -08:00
Jessie Frazelle b97c763249 Merge pull request #9823 from tianon/CONFIG_POSIX_MQUEUE 
Add CONFIG_POSIX_MQUEUE to check-config.sh
 2014-12-26 16:54:14 -07:00
Tianon Gravi 587286bbaa Add descriptions for bell, lumiere, morse, nobel, ptolemy, and wright 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2014-12-26 16:53:40 -07:00
Tianon Gravi ed21031353 Switch names-generator arrays to be long-form 
This way, we can embed the link/description lines directly in the array itself, conflicts between PRs to this section are minimized, new PRs are easier to review, and it's a lot easier to notice when people are missing a link/description (like the few that currently are).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2014-12-26 16:44:47 -07:00
Tianon Gravi 8803174e4f Add CONFIG_POSIX_MQUEUE to check-config.sh 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2014-12-26 14:59:25 -07:00
Jessica Frazelle 98d5720594 Add test for non local mac address. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-12-26 10:22:14 -08:00
Alexander Morozov b98c352e4f Merge pull request #9813 from nurkiewicz/banach 
Stefan Banach in names-generator
 2014-12-26 09:37:16 -08:00
Alexander Morozov 979d2f316a Merge pull request #9816 from ankushagarwal/names-generator-comment-correction 
Fix names-generator comment about name generation
 2014-12-26 09:35:16 -08:00
Ankush Agarwal 6df1eff85e Fix names-generator comment about name generation 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2014-12-25 22:54:38 -08:00
Tomasz Nurkiewicz 6e96dcec3c Stefan Banach in names-generator 
Signed-off-by: Tomasz Nurkiewicz <nurkiewicz@gmail.com>
 2014-12-26 00:06:56 +01:00
Jessie Frazelle 4a81661f5e Merge pull request #9804 from tianon/dockerfile-tweaks 
Adjust Dockerfile style to be more consistent
 2014-12-24 16:23:20 -08:00
Tianon Gravi 179e9deb1a Adjust Dockerfile style to be more consistent 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2014-12-24 00:26:19 -07:00
Tianon Gravi 4baa240065 Merge pull request #9802 from icecrime/9284_tianon_ocd 
Fix indentation
 2014-12-23 22:42:38 -08:00
Arnaud Porterie 6c7204393b Fix indentation 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-23 22:01:04 -08:00
Michael Crosby 305c898cd7 Merge pull request #9795 from LK4D4/update_libcontainer 
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
 2014-12-23 15:41:26 -08:00
Jessica Frazelle 7fdbd90f88 Return usage on parseExec error. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-12-23 12:49:45 -08:00
Alexander Morozov 50905a6d6c Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b 
This commit contains changes for docker:
* user.GetGroupFile to user.GetGroupPath docker/libcontainer#301
* Add systemd support for OOM docker/libcontainer#307
* Support for custom namespaces docker/libcontainer#279, docker/libcontainer#312
* Fixes #9699 docker/libcontainer#308

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2014-12-23 12:10:03 -08:00
Victor Vieux 8412e3c226 Merge pull request #9791 from proppy/break 
api/server: commenting proppy from maintainer
 2014-12-23 11:05:33 -08:00
Johan Euphrosine 4fd2a9156c api/server: commenting proppy from maintainer 
Signed-off-by: Johan Euphrosine <proppy@google.com>
 2014-12-23 11:01:27 -08:00
Jessie Frazelle ed49db8984 Merge pull request #9754 from tiborvass/remove-insecure-registry-all-ports 
registry: remove accidentally added --insecure-registry feature
 2014-12-23 10:40:10 -08:00
Alexander Morozov 1e2d0d17d9 Merge pull request #9583 from brahmaroutu/remove_container_9569 
Error should be 409 as the container is different state to remove
 2014-12-23 10:09:58 -08:00
Tianon Gravi 084bf8a864 Merge pull request #9756 from tianon/clarify-btrfs-version-dep 
Clarify preferred btrfs-progs dependency and fix some minor inconsistencies
 2014-12-23 09:25:55 -08:00
Alexander Morozov 043e33c2c1 Merge pull request #9757 from lindenlab/9712-validTagName-errormessage 
Fixing ValidateTagName error message #9712
 2014-12-22 21:17:03 -08:00
Jessie Frazelle 034ba8b88f Merge pull request #9765 from thaJeztah/improve-error-message-3036 
Improve error message for conflicting container name.
 2014-12-22 18:02:48 -08:00
Sven Dowideit 7a3efc9aa5 Merge pull request #9783 from SvenDowideit/pr_out_debian_wheezy_backports_kernel_updated_to_3_16 
Debian Wheezy backports kernel updated to 3.16
 2014-12-23 11:19:26 +10:00
panticz 973c3c768b Debian Wheezy backports kernel updated to 3.16 
Replaces #9723

fix by: panticz <mail@konczalski.de> (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-23 11:14:14 +10:00
Sven Dowideit 197281f585 Merge pull request #9740 from SvenDowideit/pr_out_fixes_as_requested 
Login with PUTTY instead of using the CMD
 2014-12-23 11:11:53 +10:00
Sven Dowideit db165f7d2c fixes as requested 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-12-23 11:06:45 +10:00
Krasimir Georgiev 948f33263e Changing the windows installation doc to include instructions how to login 
using putty instead of CMD

Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk>

Docker-DCO-1.1-Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk> (github: SvenDowideit)
 2014-12-23 11:06:44 +10:00
Sven Dowideit dda2b19439 Merge pull request #9782 from SvenDowideit/pr_out_update_debian_version_to_7_7 
Update Debian version to 7.7
 2014-12-23 11:02:50 +10:00
panticz 491ff81a0b Update Debian version to 7.7 
Replaces #9724

fix by: panticz <mail@konczalski.de> (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-23 10:53:36 +10:00
Jessie Frazelle 9f6feaa3c3 Merge pull request #9781 from mota/deadfunc-vfs-driver 
Cleanup: Remove unused function from vfs storage driver
 2014-12-22 16:17:53 -08:00
Pierre Wacrenier c1e04fbb15 Remove unused function from vfs storage driver 
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
 2014-12-23 00:36:20 +01:00
Jessie Frazelle d09421a74f Merge pull request #9615 from unclejack/bump_go_to_1.4 
bump Go to 1.4
 2014-12-22 15:07:57 -08:00
Alexander Morozov 04117e4021 Merge pull request #7003 from porjo/6034-fowardChain 
Move per-container forward rules to DOCKER chain
 2014-12-22 14:40:42 -08:00
Jessie Frazelle b1cf41d952 Merge pull request #9750 from icecrime/9652_revert_doc 
Revert doc changes from #9652
 2014-12-22 12:43:51 -08:00
Jessie Frazelle 4d0fcb64d2 Merge pull request #9284 from icecrime/client_only_integration_tests 
Enable test-integration-cli for Windows platform
 2014-12-22 12:32:48 -08:00
Alexander Morozov 67e34350b7 Merge pull request #9742 from yadutaf/master 
Start new API v1.17 docs
 2014-12-22 11:31:08 -08:00
unknown aa9c9569c2 Improve error message for conflicting container name. 
This changes the error message that is returned by the daemon when
a container-name already exists.

The old message suggests that containers can be renamed, which is
currently not possible.

To prevent confusion, the part "(or rename)" is removed from
the error-message.

Message before this change;

    FATA[0000] Error response from daemon: Conflict, The name foobar is already assigned to 728ac36fb0ab. You have to delete (or rename) that container to be able to assign foobar to a container again.

Message after this change;

    FATA[0000] Error response from daemon: Conflict. The name 'foobar' is already in use by container 728ac36fb0ab. You have to delete that container to be able to reuse that name.

Relates to: https://github.com/docker/docker/issues/3036

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2014-12-22 09:59:08 +01:00
Jean-Tiare Le Bigot 800a8e896e start new API v1.17 docs 
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
 2014-12-22 09:01:33 +01:00
Alexander Morozov a31c14cadc Fix TestBuildWithTabs for go 1.4 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2014-12-21 13:49:45 +02:00
Alexander Morozov 6ac802ecd8 Reinstall standard library with netgo 
Fixes #9449

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2014-12-21 13:49:45 +02:00
unclejack 62e8a93c34 bump Go to 1.4 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-21 13:49:45 +02:00
Ian Bishop 38a595aec5 Tidy driver.go/LinkContainers 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
 2014-12-21 13:42:02 +10:00
Ian Bishop 137ceae913 Update networking.md with new iptables behaviour 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
 2014-12-21 12:57:32 +10:00
Ian Bishop 0da92633b4 Create tests for pkg/iptables 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
 2014-12-21 12:57:32 +10:00
Porjo 2865373894 Create DOCKER forward chain on driver init 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
 2014-12-21 12:57:32 +10:00
Porjo cc89b30d35 Move per-container forward rules to DOCKER chain 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
 2014-12-21 12:57:32 +10:00