docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
12,265 Commits 12 Branches 295 Tags
c77458bef612cec6ea39edd117ba4a4e25972d3a
Commit Graph

11324 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Jessica Frazelle
7600027e7b I don't know how this happened, repeated word typo. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 29ed8a2289c932217c47b99cef3d91cbfc0d965e
Component: engine
 2014-12-18 18:09:41 -08:00
Tibor Vass
11159bae89 registry: handle unresolvable domain names in isSecure 
to allow HTTP proxies to work as expected.

Fixes #9708

Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: ff4bfcc0e9f171a95dac5cc2650faacf73943057
Component: engine
 2014-12-18 19:16:55 -05:00
Tibor Vass
3b8d2a3264 registry: add tests for unresolvable domain names in isSecure 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: a70d7aaf282948c6873c03031cee0704cbe86476
Component: engine
 2014-12-18 19:16:55 -05:00
Tibor Vass
625be9e469 Merge pull request #8827 from jlhawn/build_implied_from_scratch 
Make `FROM scratch` a special cased 'no-base' spec
Upstream-commit: 610842f906a942e9784bc16c201860dc89ba19ba
Component: engine
 2014-12-18 18:21:16 -05:00
Josh Hawn
98bb6eba72 Make FROM scratch a special cased 'no-base' spec 
There has been a lot of discussion (issues 4242 and 5262) about making
`FROM scratch` either a special case or making `FROM` optional, implying
starting from an empty file system.

This patch makes the build command `FROM scratch` special cased from now on
and if used does not pull/set the the initial layer of the build to the ancient
image ID (511136ea..) but instead marks the build as having no base image. The
next command in the dockerfile will create an image with a parent image ID of "".
This means every image ever can now use one fewer layer!

This also makes the image name `scratch` a reserved name by the TagStore. You
will not be able to tag an image with this name from now on. If any users
currently have an image tagged as `scratch`, they will still be able to use that
image, but will not be able to tag a new image with that name.

Goodbye '511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158',
it was nice knowing you.

Fixes #4242

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 8936789919c5c8004f346f44a3452d1521818b60
Component: engine
 2014-12-18 14:03:38 -08:00
Vincent Batts
014708a765 Merge pull request #9733 from unclejack/disable_tarsum_logging 
pkg/tarsum: delete the logging code
Upstream-commit: 502a1a4e1a36cfcdd88139b0b35723e86d6198cf
Component: engine
 2014-12-18 16:54:59 -05:00
unclejack
5cdc9005f7 pkg/tarsum: delete the logging code 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: e7c0587d541cd9f224df622b2f97c918e68cfb05
Component: engine
 2014-12-18 23:38:26 +02:00
Tianon Gravi
f9482108f5 Merge pull request #9688 from dqminh/fix-make-tgz 
make.sh tgz should handle windows binary
Upstream-commit: 1531bf48aa87b4a8336ab735ef025e83f09acac1
Component: engine
 2014-12-18 13:16:32 -08:00
Michael Crosby
46b7cd5c49 Merge pull request #9720 from jlhawn/apply_diff_optimize 
Refactor to optimize storage driver ApplyDiff()
Upstream-commit: e850568bf6f67b5fadd9767544b1cf7bc6fcc317
Component: engine
 2014-12-18 11:58:47 -08:00
Mary Anthony
bdb7f879f7 Argghhh...I need to automate that signoff. Fixing lack of signoff 
Signed-off-by: Mary Anthony <moxieandmore@gmail.com>
Upstream-commit: 801fd1af256134b749ee3dd29ea5ed41d2594482
Component: engine
 2014-12-18 09:10:08 -08:00
Alexander Morozov
4af408b6c1 Merge pull request #9635 from duglin/Issue3936 
Allow for relative paths on ADD/COPY
Upstream-commit: 364720b5e7e725cdc466171de873eefdb8609a33
Component: engine
 2014-12-18 06:58:50 -08:00
Doug Davis
a9b8d39261 Allow for relative paths on ADD/COPY 
Moved Tianon's PR from: https://github.com/docker/docker/pull/7870
on top of the latest code

Closes: #3936

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f21f9f856e9d5af23521f131799028c2e67c04ed
Component: engine
 2014-12-18 05:13:04 -08:00
Josh Hawn
9c05f0eaf9 Refactor to optimize storage driver ApplyDiff() 
To avoid an expensive call to archive.ChangesDirs() which walks two directory
trees and compares every entry, archive.ApplyLayer() has been extended to
also return the size of the layer changes.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 35a22c9e12c05e2a0a205964702ced78ea39d7a1
Component: engine
 2014-12-17 21:54:23 -08:00
Michael Crosby
0935b51529 Merge pull request #9181 from icecrime/allocate_daemon_ports 
Allocate daemon listening ports
Upstream-commit: 21bba5d93a888e20d7fa8d7dd56efbdd1fd486c1
Component: engine
 2014-12-17 18:01:20 -08:00
Fred Lifton
9667f960f7 Merge pull request #9683 from SvenDowideit/docker-exec-error-when-paused 
Update the documentation for #9356 fix
Upstream-commit: f2b89166cf3d352298496ea19a7b72bf5b1cba54
Component: engine
 2014-12-17 17:04:25 -08:00