p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,275 Commits 2 Branches 295 Tags
2ef01256f0b2871b433cd07c8bafa2a340b3eb93
Commit Graph

12275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessica Frazelle
2ef01256f0 Add test for non local mac address. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 98d5720594d275071f43fbf90daf5fcd1166df8b
Component: engine
 2014-12-26 10:22:14 -08:00
Michael Crosby
2a5b064872 Merge pull request #9795 from LK4D4/update_libcontainer 
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
Upstream-commit: 305c898cd7fa8e7152f3f01cfdc2f5c14b4d35f0
Component: engine
 2014-12-23 15:41:26 -08:00
Alexander Morozov
c77458bef6 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>
Upstream-commit: 50905a6d6ce2fdd1ab0c33ec0b7a26895e0cbeea
Component: engine
 2014-12-23 12:10:03 -08:00
Victor Vieux
30ac134aba Merge pull request #9791 from proppy/break 
api/server: commenting proppy from maintainer
Upstream-commit: 8412e3c226d870c6c156a6ba7a1773e025b29560
Component: engine
 2014-12-23 11:05:33 -08:00
Johan Euphrosine
5de3fe398b api/server: commenting proppy from maintainer 
Signed-off-by: Johan Euphrosine <proppy@google.com>
Upstream-commit: 4fd2a9156cafba7d0747d7a049eda12aac86daf8
Component: engine
 2014-12-23 11:01:27 -08:00
Jessie Frazelle
140c87342c Merge pull request #9754 from tiborvass/remove-insecure-registry-all-ports 
registry: remove accidentally added --insecure-registry feature
Upstream-commit: ed49db89845d1fd43ad5fecf268bfbb3e47f7e50
Component: engine
 2014-12-23 10:40:10 -08:00
Alexander Morozov
492ed0b266 Merge pull request #9583 from brahmaroutu/remove_container_9569 
Error should be 409 as the container is different state to remove
Upstream-commit: 1e2d0d17d98e25cd315a60ab6ca83c1662ebe649
Component: engine
 2014-12-23 10:09:58 -08:00
Tianon Gravi
203c93b72e Merge pull request #9756 from tianon/clarify-btrfs-version-dep 
Clarify preferred btrfs-progs dependency and fix some minor inconsistencies
Upstream-commit: 084bf8a8640f92f439d1064c4596987ce29d4adb
Component: engine
 2014-12-23 09:25:55 -08:00
Alexander Morozov
8644c9a097 Merge pull request #9757 from lindenlab/9712-validTagName-errormessage 
Fixing ValidateTagName error message #9712
Upstream-commit: 043e33c2c150507915b12ed9f657895a7900605b
Component: engine
 2014-12-22 21:17:03 -08:00
Jessie Frazelle
e9f43223c9 Merge pull request #9765 from thaJeztah/improve-error-message-3036 
Improve error message for conflicting container name.
Upstream-commit: 034ba8b88fdcc3d5100ae0d2edc914673b15a2f4
Component: engine
 2014-12-22 18:02:48 -08:00
Sven Dowideit
50e537246c Merge pull request #9783 from SvenDowideit/pr_out_debian_wheezy_backports_kernel_updated_to_3_16 
Debian Wheezy backports kernel updated to 3.16
Upstream-commit: 7a3efc9aa5441285c85724e360811abf6146c464
Component: engine
 2014-12-23 11:19:26 +10:00
panticz
147e9f2038 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>
Upstream-commit: 973c3c768be19b80543631ad9515fe05b95b2d22
Component: engine
 2014-12-23 11:14:14 +10:00
Sven Dowideit
af134040ea Merge pull request #9740 from SvenDowideit/pr_out_fixes_as_requested 
Login with PUTTY instead of using the CMD
Upstream-commit: 197281f5858a90f7fdf8418e19b362fa57a052f3
Component: engine
 2014-12-23 11:11:53 +10:00
Sven Dowideit
892e46c364 fixes as requested 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: db165f7d2c3e05bbd7bac8c1188145370c7b1171
Component: engine
 2014-12-23 11:06:45 +10:00
Krasimir Georgiev
4725a40462 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)
Upstream-commit: 948f33263e95997a9c6596d695c92ab03c630899
Component: engine
 2014-12-23 11:06:44 +10:00
Sven Dowideit
4f66ac7b6d Merge pull request #9782 from SvenDowideit/pr_out_update_debian_version_to_7_7 
Update Debian version to 7.7
Upstream-commit: dda2b194394f1e0a10219c0b92583276a8b0a788
Component: engine
 2014-12-23 11:02:50 +10:00
panticz
fab564562c Update Debian version to 7.7 
Replaces #9724

fix by: panticz <mail@konczalski.de> (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 491ff81a0b6653d75b2bc4ca81251d7bf5ee9f3f
Component: engine
 2014-12-23 10:53:36 +10:00
Jessie Frazelle
99ea70cc7b Merge pull request #9781 from mota/deadfunc-vfs-driver 
Cleanup: Remove unused function from vfs storage driver
Upstream-commit: 9f6feaa3c3c957b1981456eb85ba61e19bc86cbd
Component: engine
 2014-12-22 16:17:53 -08:00
Pierre Wacrenier
7a5549d8ea Remove unused function from vfs storage driver 
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
Upstream-commit: c1e04fbb150d71c243d505b79136108cb2f31f5c
Component: engine
 2014-12-23 00:36:20 +01:00
Jessie Frazelle
12ac4f3199 Merge pull request #9615 from unclejack/bump_go_to_1.4 
bump Go to 1.4
Upstream-commit: d09421a74fa268274c50308f2655e654949f505b
Component: engine
 2014-12-22 15:07:57 -08:00
Alexander Morozov
5364411768 Merge pull request #7003 from porjo/6034-fowardChain 
Move per-container forward rules to DOCKER chain
Upstream-commit: 04117e4021da9d7fcd376b345074b84ebbd4f0ce
Component: engine
 2014-12-22 14:40:42 -08:00
Jessie Frazelle
1e6bf96127 Merge pull request #9750 from icecrime/9652_revert_doc 
Revert doc changes from #9652
Upstream-commit: b1cf41d952d8600e0d630600dd2c567e610d9b92
Component: engine
 2014-12-22 12:43:51 -08:00
Jessie Frazelle
cd1df8aef7 Merge pull request #9284 from icecrime/client_only_integration_tests 
Enable test-integration-cli for Windows platform
Upstream-commit: 4d0fcb64d25acc90fadc1a877464d815b575a509
Component: engine
 2014-12-22 12:32:48 -08:00
Alexander Morozov
f66fbdeb68 Merge pull request #9742 from yadutaf/master 
Start new API v1.17 docs
Upstream-commit: 67e34350b7eaed3f517a524c012ff8284cde09b2
Component: engine
 2014-12-22 11:31:08 -08:00
unknown
cc053abec3 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>
Upstream-commit: aa9c9569c29e3696c9427d2d66341c95fe076e4f
Component: engine
 2014-12-22 09:59:08 +01:00
Jean-Tiare Le Bigot
10b295c1df start new API v1.17 docs 
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
Upstream-commit: 800a8e896e810019b625ad0161c4fc4a04c26845
Component: engine
 2014-12-22 09:01:33 +01:00
Alexander Morozov
bc1cbc1f63 Fix TestBuildWithTabs for go 1.4 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a31c14cadca4052a0a141347b322d825f56b814b
Component: engine
 2014-12-21 13:49:45 +02:00
Alexander Morozov
50a73ae598 Reinstall standard library with netgo 
Fixes #9449

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6ac802ecd8e097f49c4b026fd7b5febfc683866c
Component: engine
 2014-12-21 13:49:45 +02:00
unclejack
88e70a98ec bump Go to 1.4 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 62e8a93c3496791e8bfb2204f68b2a1cdf61fec9
Component: engine
 2014-12-21 13:49:45 +02:00
Ian Bishop
d0893cb64b Tidy driver.go/LinkContainers 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
Upstream-commit: 38a595aec561b8a7b4325b6c1c4efd1b0b8e89c0
Component: engine
 2014-12-21 13:42:02 +10:00
Ian Bishop
c1a6d58dbd Update networking.md with new iptables behaviour 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
Upstream-commit: 137ceae9138e535f8b3f4e76bda18f6db954c231
Component: engine
 2014-12-21 12:57:32 +10:00
Ian Bishop
4b105a7583 Create tests for pkg/iptables 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
Upstream-commit: 0da92633b4161ed1f8babe5ec4a9fe98257d34b5
Component: engine
 2014-12-21 12:57:32 +10:00
Porjo
ae55b92633 Create DOCKER forward chain on driver init 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
Upstream-commit: 2865373894f1532fa725481e8f04db4a5d7a0aa8
Component: engine
 2014-12-21 12:57:32 +10:00
Porjo
c720d69487 Move per-container forward rules to DOCKER chain 
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
Upstream-commit: cc89b30d35edc02fc598a0b26fe7a1ed002238e4
Component: engine
 2014-12-21 12:57:32 +10:00
Arnaud Porterie
e61e114873 Enable test-integration-cli for Windows platform 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f3ed42286e7df3a35ca41a4d19fab2a53a08b382
Component: engine
 2014-12-20 16:40:40 -08:00
Don Kjer
57eaf85313 Fixing ValidateTagName error message 
Signed-off-by: Don Kjer <don.kjer@gmail.com>
Upstream-commit: b74ccf2a1b9d146fef0bca89a2f6a40eb4c3e486
Component: engine
 2014-12-19 22:48:31 +00:00
Tianon Gravi
2acb3380fb Clarify preferred btrfs-progs dependency and fix some minor inconsistencies 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 585202650cdf0307fcc77ba3c165c5dc8338432c
Component: engine
 2014-12-19 15:36:22 -07:00
Tibor Vass
3ee3e640f2 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>
Upstream-commit: 9a50dd5f37d001d7c453ea8749454b4c8bf728f1
Component: engine
 2014-12-19 16:46:29 -05:00
Alexander Morozov
a2d81fbbe1 Merge pull request #9741 from tianon/test-docker-py 
Add docker-py integration tests aginst the docker daemon
Upstream-commit: 0874f9ab77a7957633cd835241a76ee4406196d8
Component: engine
 2014-12-19 11:57:35 -08:00
Tibor Vass
58481153fe 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
Upstream-commit: b88d9699ff7577e7d7a42ba4477cbfca45a953da
Component: engine
 2014-12-19 14:53:48 -05:00
Srini Brahmaroutu
1ba8727736 Error should be 409 as the container is different state to remove 
Closes #9569

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 6599aa3368f369e6b8632cc2c12f214b0450a5a6
Component: engine
 2014-12-19 19:00:28 +00:00
Tianon Gravi
241c2f0465 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>
Upstream-commit: 100267de81985bbf3b976bfde850def89487dc11
Component: engine
 2014-12-19 10:47:01 -07:00
Tibor Vass
3e225e58ab Merge pull request #9751 from unclejack/revert_9233 
Fix pkg/units compilation of size_test
Upstream-commit: 13250569f664e33c7c92f6304d35045d5145f5ba
Component: engine
 2014-12-19 11:56:23 -05:00
unclejack
913aff3176 pkg/units: fix size_test.go compilation 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: e59aad9cd387bf20dc0f4664afdd5c55b394cb5b
Component: engine
 2014-12-19 18:38:12 +02:00
Arnaud Porterie
404ad10e94 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>
Upstream-commit: edb75b486e5459c8ffce6d6b9d26645c1187c5ff
Component: engine
 2014-12-19 08:13:33 -08:00
Tibor Vass
ad1b9f394b Merge pull request #9746 from unclejack/graphdb_fix 
pkg/graphdb: use transactions for transactions
Upstream-commit: f7a449f92b88ca2a3db2fb33abade8c25a19c390
Component: engine
 2014-12-19 11:11:59 -05:00
unclejack
e2e02c60dd pkg/graphdb: use transactions for transactions 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: e9f37a011872fa89669dc105df27e1c6e16124b6
Component: engine
 2014-12-19 13:57:21 +02:00
Michael Crosby
c7d1f45ca3 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
Upstream-commit: 2acb856dff848bd69c5e971f6352854a26362164
Component: engine
 2014-12-18 18:33:01 -08:00
Michael Crosby
b66800136d Merge pull request #9738 from jfrazelle/da-fuk-merge 
Repeated word typo.
Upstream-commit: d6d2ff4df7100d219ed9d23d754a53913c1f1c43
Component: engine
 2014-12-18 18:30:04 -08:00
James Turnbull
93c395dffa Merge pull request #9657 from moxiegirl/9655 
Clarify Mac OS X experience. Signed-off by: Mary Anthony (moxieandmore@g...
Upstream-commit: 3e3749fe4b72c6fe9afd44c35c79c804b3ef1678
Component: engine
 2014-12-18 21:29:02 -05:00