beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12274 commits 14 branches 412 tags 338 MiB
Commit graph

12274 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Crosby
305c898cd7 Merge pull request #9795 from LK4D4/update_libcontainer 
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
 2014-12-23 15:41:26 -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
Arnaud Porterie
f3ed42286e Enable test-integration-cli for Windows platform 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-20 16:40:40 -08:00
Don Kjer
b74ccf2a1b Fixing ValidateTagName error message 
Signed-off-by: Don Kjer <don.kjer@gmail.com>
 2014-12-19 22:48:31 +00:00
Tianon Gravi
585202650c Clarify preferred btrfs-progs dependency and fix some minor inconsistencies 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2014-12-19 15:36:22 -07:00
Tibor Vass
9a50dd5f37 registry: remove accidentally added --insecure-registry feature 
If `--insecure-registry mydomain.com` was specified, it would match a registry at mydomain.com on any port.
This was accidentally added in #9735 and is now being reverted.

Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-19 16:46:29 -05:00
Alexander Morozov
0874f9ab77 Merge pull request #9741 from tianon/test-docker-py 
Add docker-py integration tests aginst the docker daemon
 2014-12-19 11:57:35 -08:00
Tibor Vass
b88d9699ff Merge pull request #9735 from tiborvass/fix-issecure-for-http-proxies 
Handle unresolvable domain names in isSecure to allow HTTP proxies to work as expected
 2014-12-19 14:53:48 -05:00
Srini Brahmaroutu
6599aa3368 Error should be 409 as the container is different state to remove 
Closes #9569

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2014-12-19 19:00:28 +00:00
Tianon Gravi
100267de81 Tweak test-docker-py feature 
- move docker/docker-py clone to the Dockerfile
- put "integration test daemon startup" code in a separate file for both scripts to source
- add new test-docker-py Makefile target
- include "python-websocket" package in Dockerfile for running the tests

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2014-12-19 10:47:01 -07:00
Tibor Vass
13250569f6 Merge pull request #9751 from unclejack/revert_9233 
Fix pkg/units compilation of size_test
 2014-12-19 11:56:23 -05:00
unclejack
e59aad9cd3 pkg/units: fix size_test.go compilation 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-19 18:38:12 +02:00
Arnaud Porterie
edb75b486e Revert doc changes from #9652 
Because the patch is not in 1.4, the v1.16 docs shouldn't have been
updated. Docs were promoted to v1.17 by #9742.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-19 08:13:33 -08:00
Tibor Vass
f7a449f92b Merge pull request #9746 from unclejack/graphdb_fix 
pkg/graphdb: use transactions for transactions
 2014-12-19 11:11:59 -05:00
unclejack
e9f37a0118 pkg/graphdb: use transactions for transactions 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-19 13:57:21 +02:00
Michael Crosby
2acb856dff Merge pull request #9233 from inatatsu/fix-pkg-units-size-for-gccgo 
Fix to avoid a compile error due to float to int truncation with GCCGO
 2014-12-18 18:33:01 -08:00
Michael Crosby
d6d2ff4df7 Merge pull request #9738 from jfrazelle/da-fuk-merge 
Repeated word typo.
 2014-12-18 18:30:04 -08:00
James Turnbull
3e3749fe4b Merge pull request #9657 from moxiegirl/9655 
Clarify Mac OS X experience. Signed-off by: Mary Anthony (moxieandmore@g...
 2014-12-18 21:29:02 -05:00
Jessica Frazelle
29ed8a2289 I don't know how this happened, repeated word typo. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-12-18 18:09:41 -08:00