toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
12,238 Commits 3 Branches 295 Tags
4b105a75837c7f3fadc97edec23afa8d8330455c
Commit Graph
12238 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Fred Lifton f644595194 Merge pull request #9682 from SvenDowideit/scottstamp-stale-links-pr-carry 
Scottstamp stale links pr carry
Upstream-commit: 5df189a1b0b63d66f1478e12e4e738e2378f26b0
Component: engine
 2014-12-17 16:03:55 -08:00
Michael Crosby bbde483637 Merge pull request #9715 from brahmaroutu/gccgo_power1 
Fix to avoid a compile error due to float to int truncation with GCCGO
Upstream-commit: f1562ac658b859bc497a3eb76fe3333fe1240e98
Component: engine
 2014-12-17 16:02:27 -08:00
Sven Dowideit 289ddd39ea Merge pull request #9717 from SvenDowideit/redirect-opensuse-to-suse 
redirect openSUSE docs to SUSE doc
Upstream-commit: 1f9b6fedca7cad1f4aeec79f5568f8415fcba848
Component: engine
 2014-12-18 09:28:57 +10:00
Sven Dowideit 85fa2dc157 redirect openSUSE docs to SUSE doc 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: de2a91970dfd1f6078179ffffd63ec1842c95bd9
Component: engine
 2014-12-18 09:05:27 +10:00
Srini Brahmaroutu 7662fb34f6 Fix to avoid a compile error due to float to int truncation with GCCGO 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: c16e41245ebaf426a5ad27ebe82597647c7743a3
Component: engine
 2014-12-17 22:44:55 +00:00
Jessie Frazelle 7e971053a8 Merge pull request #9711 from rhatdan/man 
docker-run man page has screwed up indenting on --net option
Upstream-commit: 27b07bc39e45dd52562c2590b9e914282923e136
Component: engine
 2014-12-17 14:14:47 -08:00
Michael Crosby da3465e509 Add docker-py integration tests aginst the docker daemon 
This clones and run the integration tests for docker-py master as part
of the integration tests created on master.  docker-py hits the api
directly and should be a good way to identify regressions in the api.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5d6eca6642c5749099513f1f66bb44e004aa0938
Component: engine
 2014-12-17 13:48:45 -08:00
Alexander Morozov 037d73a114 Merge pull request #9713 from unclejack/bump_vendored_kr_pty 
kr/pty: vendor upstream 05017fcccf
Upstream-commit: c7f19c15d9d9a79dec5a4062c002845eabb1b805
Component: engine
 2014-12-17 13:48:16 -08:00
unclejack 401a4f9dcd kr/pty: vendor upstream 05017fcccf 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 2524c0c5555f9127b4cd3d326430617f72979bab
Component: engine
 2014-12-17 23:23:24 +02:00
Dan Walsh 21d58a4cf6 docker-run man page has screwed up indenting on --net option 
This patch fixes the indenting.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: bc1507dfce956846ba1515ccbfcd202c06aa995b
Component: engine
 2014-12-17 13:06:13 -05:00
Sven Dowideit c58b5b4ae4 Merge pull request #9703 from fredlf/1.4.1-docs-update 
Additions for 1.4.1 release
Upstream-commit: f0f4e42375353dc04101bb7d0f263500f4d2d046
Component: engine
 2014-12-17 21:13:04 +10:00
Daniel, Dao Quang Minh 148e64f5bf add binary extension to docker binary in tgz 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: ed7aa47dea9553a89e39c16397752ef0e791aab3
Component: engine
 2014-12-16 22:55:29 -05:00
Fred Lifton 8f8a34a48e Additions for 1.4.1 release 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 6afe5bf9ede46b81fb63283c55488dbbc50d5a07
Component: engine
 2014-12-16 17:40:02 -08:00
Jessie Frazelle 844e36c24a Merge pull request #9701 from crosbymichael/registry-lookup-image 
Change LookupRemoteImage to return error
Upstream-commit: 4988cde7b95437173be224cf1783bf5d7ef34074
Component: engine
 2014-12-16 17:00:59 -08:00
Jessie Frazelle 1ae5788059 Merge pull request #9083 from SvenDowideit/pr_out_remove_small_patch_exception_checking_in_hack_make_validate_dco 
Remove small patch exception checking in hack/make/validate-dco
Upstream-commit: d06f496e4a41762ffa7adf5fac59de00d27d1196
Component: engine
 2014-12-16 16:25:17 -08:00
Daehyeok Mun d6330f220b Chnage LookupRemoteImage to return error 
This commit is patch for following comment
// TODO: This method should return the errors instead of masking them and returning false

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 8123c1e9fef0eb0d6b4e89dce4089276b751906c
Component: engine
 2014-12-16 16:23:19 -08:00
Alexander Morozov 9306adcecc Merge pull request #9652 from yadutaf/master 
Set HTTP upgrade headers when hijacking connection
Upstream-commit: f538e4be6b56ba4f69b5e5b909dd00b1bcc3081d
Component: engine
 2014-12-16 16:21:29 -08:00
Sven Dowideit 752a46a922 Give maintainers the power to add contributor's DCO to a commit message, or to use their own if its a trvial change 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 56e3f49d1900f86b429a5a69839cc4f95af4dedc
Component: engine
 2014-12-17 10:02:36 +10:00
Tianon Gravi 3cceb0c88b Remove small patch exception checking in hack/make/validate-dco 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 3d8f40b35b7f035bbcd7b7f99064838b24afa1f6
Component: engine
 2014-12-17 10:02:36 +10:00
Michael Crosby e9f312e1d4 Remove DCO small patch exception 
As we move forward on automating our pull request review process and
tooling these exceptions hurt more than they help.  For consistency we
should not allow small patch exceptions for anything.  The source of
truth going forward for DCO and builds are the official drone status on
each pull request.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: af72f2128e7c4ebd12a9fef7e7381ef42a52ed0c
Component: engine
 2014-12-17 10:02:36 +10:00
Jean-Tiare Le Bigot 6447946d2c Update connection hijacking documentation with HTTP Upgrade Headers 
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
Upstream-commit: afb06a3ce2e769951a89a889f11b9ab5eea54dff
Component: engine
 2014-12-17 00:22:06 +01:00
Jessie Frazelle 2261562cd0 Merge pull request #9287 from drothlis/fix-upstart-race-condition 
upstart: Don't emit "started" event until docker.sock is available
Upstream-commit: ad8096a1c2b4786ade4a79275683aecd31a090fd
Component: engine
 2014-12-16 14:15:01 -08:00