summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Unix adapter bug with newer versions of requests811-unix-adapterJoffrey F2015-10-191-3/+11
| | | | | | | | | The select_proxy utility in requests errors out when the provided URL doesn't have a hostname, like is the case when using a UNIX socket. Since proxies are an irrelevant notion in the case of UNIX sockets anyway, we simply return the path URL directly. Signed-off-by: Joffrey F <joffrey@docker.com>
* Back to dev versionJoffrey F2015-10-191-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #808 from alasdairnicol/docs_examplesDaniel Nephin2015-10-156-26/+26
|\ | | | | Docs examples
| * Tidied up code examples in docsAlasdair Nicol2015-10-146-26/+26
| | | | | | | | | | | | | | | | * Use `cli = Client` everywhere * Use Client.create_host_config method * Added missing '>'s Signed-off-by: Alasdair Nicol <alasdair@thenicols.net>
* | Pull correct version of busybox in integration testsJoffrey F2015-10-141-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'delfick-patch-1'Joffrey F2015-10-145-12/+123
|\ \ | |/ |/|
| * Fix attach method over SSL connectionsStephen Moore2015-10-145-12/+123
| | | | | | | | Signed-off-by: Stephen Moore <stephen@delfick.com>
| * Use DOCKER_CONFIG environment variable to look up auth configJoffrey F2015-10-142-57/+84
| | | | | | | | | | | | When provided, default paths are ignored. Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add devices param to the hostconfig documentationJoffrey F2015-10-141-0/+8
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Update changelog and bump version to 1.5.0Joffrey F2015-10-142-1/+38
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Use url-safe base64 when encoding auth headerJoffrey F2015-10-142-4/+15
| | | | | | | | | | | | + regression test Signed-off-by: Joffrey F <joffrey@docker.com>
| * put/get archive implementationJoffrey F2015-10-148-2/+198
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Docs: Remove float from valid cpu_shares typesJoffrey F2015-10-141-1/+1
| | | | | | | | | | | | Fixes #775 Signed-off-by: Joffrey F <joffrey@docker.com>
| * Fix testsJoffrey F2015-10-142-9/+13
| | | | | | | | | | | | Skips were masking some errors / compatibility issues Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add minimum_version decorators on NetworkApi methodsJoffrey F2015-10-141-1/+7
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Implement methods for managing networksAanand Prasad2015-10-145-1/+290
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * Don't break when volume binds contain unicode charactersJoffrey F2015-10-142-6/+104
| | | | | | | | | | | | Also includes a few unit tests for utils.convert_volume_binds Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #802 from docker/785-docker_config_envJoffrey F2015-10-132-57/+84
|\ \ | | | | | | Use DOCKER_CONFIG environment variable to look up auth config
| * | Use DOCKER_CONFIG environment variable to look up auth config785-docker_config_envJoffrey F2015-10-092-57/+84
| | | | | | | | | | | | | | | | | | When provided, default paths are ignored. Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #801 from docker/1.5.0-release1.5.0Joffrey F2015-10-123-1/+46
|\ \ \ | | | | | | | | 1.5.0 release
| * | | Add devices param to the hostconfig documentation1.5.0-releaseJoffrey F2015-10-081-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | Update changelog and bump version to 1.5.0Joffrey F2015-10-082-1/+38
| |/ / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #806 from docker/803-urlsafe-b64Joffrey F2015-10-092-4/+15
|\ \ \ | |/ / |/| | Use url-safe base64 when encoding auth header
| * | Use url-safe base64 when encoding auth header803-urlsafe-b64Joffrey F2015-10-092-4/+15
|/ / | | | | | | | | | | + regression test Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'archive_endpoint'Joffrey F2015-10-088-2/+198
|\ \
| * | put/get archive implementationJoffrey F2015-10-088-2/+198
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Docs: Remove float from valid cpu_shares typesJoffrey F2015-10-081-1/+1
|/ / | | | | | | | | | | Fixes #775 Signed-off-by: Joffrey F <joffrey@docker.com>
* | Fix testsJoffrey F2015-10-082-9/+13
| | | | | | | | | | | | Skips were masking some errors / compatibility issues Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'aanand-networking'Joffrey F2015-10-085-1/+296
|\ \
| * | Add minimum_version decorators on NetworkApi methodsJoffrey F2015-10-081-1/+7
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Merge branch 'networking' of https://github.com/aanand/docker-py into ↵Joffrey F2015-10-085-1/+290
| |\ \ |/ / / | | | | | | aanand-networking
| * | Implement methods for managing networksAanand Prasad2015-10-055-1/+290
| |/ | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #787 from docker/782-unicode-volume-pathsJoffrey F2015-10-052-6/+104
|\ \ | |/ |/| Don't break when volume binds contain unicode characters
| * Don't break when volume binds contain unicode characters782-unicode-volume-pathsJoffrey F2015-09-252-6/+104
| | | | | | | | | | | | Also includes a few unit tests for utils.convert_volume_binds Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #797 from paulbellamy/test-race-conditionmnowster2015-10-011-1/+1
|\ \ | | | | | | Fix race condition in integration regression tests
| * | Fix race condition in integration regression testsPaul Bellamy2015-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `docker port` and inspect do not return ports for containers which are not running. Because the container command is `true`, sometimes that exits before the inspect is called. Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
* | | Merge pull request #790 from aanand/shorter-stack-tracesmnowster2015-10-012-4/+6
|\ \ \ | |/ / |/| | Shorter stack traces in tests
| * | Shorter pytest stack tracesAanand Prasad2015-09-251-1/+1
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Move pytest default options into pytest.iniAanand Prasad2015-09-252-4/+6
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Merge pull request #789 from PierreF/top_ps_argsJoffrey F2015-09-285-2/+93
|\ \ \ | | | | | | | | Allow to specify ps_args when listing processes
| * | | Added test for "top" functionPierre Fersing2015-09-283-0/+87
| | | | | | | | | | | | | | | | Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
| * | | Allow to specify ps_args when listing processesPierre Fersing2015-09-252-2/+6
| |/ / | | | | | | | | | Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
* | | Merge pull request #793 from docker/792-fix-ports-commandJoffrey F2015-09-282-3/+31
|\ \ \ | |_|/ |/| | Support explicit protocol in Client.port
| * | Support explicit protocol in Client.port792-fix-ports-commandJoffrey F2015-09-282-3/+31
|/ / | | | | | | | | | | | | | | | | User can now specify a protocol in Client.port using the port/proto syntax. Default port is now TCP instead of UDP (to match the behavior of `docker port`) when no proto is specified. Regression test Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'aanand-url-variable-args'Joffrey F2015-09-254-140/+221
|\ \
| * | _url can take arbitrarily many argumentsAanand Prasad2015-09-252-14/+39
| |/ | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * Merge pull request #770 from docker/cpu_cfs_opts_supportAanand Prasad2015-09-252-126/+182
| |\ |/ / | | Support for cpu_quota and cpu_period
| * Check API version when using cpu_period and cpu_quotacpu_cfs_opts_supportJoffrey F2015-09-241-13/+21
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * cpu_quota and cpu_period unit testsJoffrey F2015-09-241-124/+155
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Add support for cpu_quota and cpu_period in host_configJoffrey F2015-09-241-1/+18
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>