summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 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>
* Merge pull request #765 from docker/api_1.20_supportJoffrey F2015-09-232-14/+24
|\ | | | | Support API version 1.20
| * Bump default API versionapi_1.20_supportJoffrey F2015-09-232-2/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Improve volume bindings integration testJoffrey F2015-09-221-21/+7
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Fix volumes tests for API version >= 1.20Joffrey F2015-09-221-13/+38
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #786 from ibuildthecloud/missing-apiJoffrey F2015-09-221-2/+2
|\ \ | | | | | | Add docker.api to setup packages
| * | Add docker.api to setup packagesDarren Shepherd2015-09-221-2/+2
|/ / | | | | | | Signed-off-by: Darren Shepherd <darren@rancher.com>
* | Merge pull request #777 from rutsky/patch-2Joffrey F2015-09-221-1/+1
|\ \ | |/ |/| specify default value of stream parameter of exec_start()
| * specify default value of stream parameter of exec_start()Vladimir Rutsky2015-09-181-1/+1
| | | | | | | | Signed-off-by: Vladimir Rutsky <vladimir@rutsky.org>
* | Merge pull request #780 from docker/contributingJoffrey F2015-09-223-1/+107
|\ \ | | | | | | [WIP] Contributing guidelines
| * | Amend version of contributing.md from feedbackcontributingJoffrey F2015-09-211-6/+34
| | | | | | | | | | | | | | | | | | | | | | | | - Add OS info request in reporting issues section - Add PR subsection about clear, logical commits - Add section describing how to set up a dev environment Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add flake8 make taskJoffrey F2015-09-212-1/+5
| | | | | | | | | | | | | | | | | | Fix 'make test' task to run a complete series of tests Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Contributing document draftJoffrey F2015-09-211-0/+74
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge branch 'aanand-integration-test-fixes'Joffrey F2015-09-222-83/+87
|\ \ \ | |/ / |/| |
| * | Make volume binds tests work on any hostAanand Prasad2015-09-222-81/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of creating the test directory directly on the host, create it by starting a container with the directory bind-mounted, so that it doesn't matter whether the daemon is local, in a VM or remote. This removes the need to make /tmp a volume in the test container, and to share it with the dind container. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Only pull busybox in integration tests if we don't already have itAanand Prasad2015-09-221-2/+6
|/ / | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Pin busybox version to use in integration testsJoffrey F2015-09-211-97/+65
| | | | | | | | | | | | Removed obsolete non-streaming build test Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #781 from docker/coverage-pinJoffrey F2015-09-211-0/+1
|\ \ | | | | | | Force coverage dependency to a version supporting py3.2
| * | Force coverage dependency to a version supporting py3.2coverage-pinJoffrey F2015-09-211-0/+1
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #772 from rutsky/patch-1Joffrey F2015-09-181-7/+7
|\ \ | | | | | | add missing dots at ends of command descriptions
| * | add missing dots at ends of command descriptionsVladimir Rutsky2015-09-161-7/+7
| | | | | | | | | | | | Signed-off-by: Vladimir Rutsky <vladimir@rutsky.org>
* | | Merge pull request #779 from rutsky/patch-4Joffrey F2015-09-181-1/+1
|\ \ \ | |_|/ |/| | fix network_mode 'none' value
| * | fix network_mode 'none' valueVladimir Rutsky2015-09-181-1/+1
|/ / | | | | Signed-off-by: Vladimir Rutsky <vladimir@rutsky.org>
* | Merge pull request #764 from docker/744-volume-api-supportJoffrey F2015-09-1615-104/+512
|\ \ | | | | | | Volume API support