summaryrefslogtreecommitdiff
path: root/docker
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>
* Fix attach method over SSL connectionsStephen Moore2015-10-141-4/+16
| | | | Signed-off-by: Stephen Moore <stephen@delfick.com>
* Use DOCKER_CONFIG environment variable to look up auth configJoffrey F2015-10-141-54/+54
| | | | | | When provided, default paths are ignored. Signed-off-by: Joffrey F <joffrey@docker.com>
* Update changelog and bump version to 1.5.0Joffrey F2015-10-141-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Use url-safe base64 when encoding auth headerJoffrey F2015-10-141-1/+1
| | | | | | + regression test Signed-off-by: Joffrey F <joffrey@docker.com>
* put/get archive implementationJoffrey F2015-10-144-1/+42
| | | | 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-143-1/+52
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Don't break when volume binds contain unicode charactersJoffrey F2015-10-141-4/+15
| | | | | | Also includes a few unit tests for utils.convert_volume_binds Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #789 from PierreF/top_ps_argsJoffrey F2015-09-281-2/+5
|\ | | | | Allow to specify ps_args when listing processes
| * Allow to specify ps_args when listing processesPierre Fersing2015-09-251-2/+5
| | | | | | | | Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
* | Support explicit protocol in Client.port792-fix-ports-commandJoffrey F2015-09-281-3/+6
| | | | | | | | | | | | | | | | | | 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>
* | _url can take arbitrarily many argumentsAanand Prasad2015-09-251-11/+12
|/ | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* 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>
* Add support for cpu_quota and cpu_period in host_configJoffrey F2015-09-241-1/+18
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Bump default API versionapi_1.20_supportJoffrey F2015-09-231-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Generic skip decorator for low API version accessible to all testsJoffrey F2015-09-169-73/+72
| | | | | | | | | | Add simpler version comparison functions Add decorator to enforce minimum version in API methods Fix utils imports Add minimum_version decorators on API methods that needed it GroupAdd test requires API version >= 1.20 Signed-off-by: Joffrey F <joffrey@docker.com>
* Modify unit tests suite to allow mock routes to optionally be method-awareJoffrey F2015-09-161-3/+5
| | | | | | | Added mock API routes for volumes API Add unit tests and integration tests for volume API Signed-off-by: Joffrey F <joffrey@docker.com>
* Basic volume API implementation.Joffrey F2015-09-153-1/+51
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* GroupAdd testsJoffrey F2015-09-151-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Support group_add param in host configgroup_add_supportJoffrey F2015-09-151-1/+8
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #763 from docker/api_splitupMaxime Petazzoni2015-09-138-1128/+1174
|\ | | | | API splitup
| * Move client internals back to Client class. Remove obsolete ClientBase classapi_splitupJoffrey F2015-09-113-293/+287
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Split different APIs into several mixins for clarity / easier maintenanceJoffrey F2015-09-117-872/+924
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Back to dev versionJoffrey F2015-09-101-1/+1
| |
* | Updated changelogJoffrey F2015-09-101-1/+1
|/ | | | | | Bumped version to 1.4.0 Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #753 from docker/715-user-int-uidJoffrey F2015-09-101-1/+1
|\ | | | | Always send a string for the user param in create_container
| * Use six.text_typeJoffrey F2015-08-311-1/+1
| |
| * Always send a string for the user param in create_containerJoffrey F2015-08-311-1/+1
| |
* | Merge pull request #754 from aanand/default-to-tcp-url-on-windowsJoffrey F2015-09-012-2/+7
|\ \ | | | | | | Default to 127.0.0.1:2375 on Windows
| * | Default to 127.0.0.1:2375 on WindowsAanand Prasad2015-09-012-2/+7
| |/ | | | | | | | | | | Following the logic of the Docker client. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | url-quote user-provided param before inserting in URL.Joffrey F2015-08-312-46/+57
|/
* Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-08-261-2/+6
|\
| * Merge pull request #662 from stevenewey/exec_create_userJoffrey F2015-08-261-2/+6
| |\ | | | | | | Exec create user
| | * Merge branch 'master' into exec_create_userStephen Newey2015-08-1210-336/+430
| | |\
| | * | Change unnecessary user=None in args to empty string and remove check.Stephen Newey2015-08-121-4/+1
| | | |
| | * | Add user argument to exec_create documentation.Stephen Newey2015-06-301-1/+1
| | | |
| | * | Add support for user on exec_create.Stephen Newey2015-06-301-2/+9
| | | |
* | | | Use cross-platform home directory pathJoffrey F2015-08-261-3/+2
| | | |
* | | | Merge branch 'default-cert-path' of https://github.com/aanand/docker-py into ↵Joffrey F2015-08-261-0/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | aanand-default-cert-path Conflicts: tests/utils_test.py
| * | | Default to ~/.docker if DOCKER_CERT_PATH is emptyAanand Prasad2015-07-211-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | Merge pull request #721 from aanand/pathspecJoffrey F2015-08-263-34/+71
|\ \ \ \ | | | | | | | | | | Better support for .dockerignore
| * | | | Better support for .dockerignoreAanand Prasad2015-08-263-34/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support all basic pattern forms: file, directory, *, ?, ! - Fix handling of wildcard patterns and subdirectories - `*/a.py` should match `foo/a.py`, but not `foo/bar/a.py` - Fix handling of directory patterns with a trailing slash - make sure they're handled equivalently to those without one - Fix handling of custom Dockerfiles - make sure they go in the tarball Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | Don't remove LogConfig.types shortcutJoffrey F2015-08-261-0/+1
| | | | |
* | | | | Remove validation of supported log driversMazz Mosley2015-08-261-13/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By having this hardcoded list of log drivers, it is a bottleneck to us supporting more log drivers. The daemon already validates if a log driver is valid or not, so rather than duplicating that validation, let's pass the log_driver along. This allows support for new/more log drivers as they become supported in docker without having to wait for both docker-py and docker-compose to support them. Keeping the current list of log driver types for backwards compatibility. Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
* | | | Prevent users from attempting to override 'version'Aanand Prasad2015-08-251-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | Merge pull request #732 from docker/version-dependent-hostconfigAanand Prasad2015-08-252-5/+22
|\ \ \ \ | | | | | | | | | | Version dependent hostconfig
| * | | | Add version param to utils.create_host_configJoffrey F2015-08-242-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add create_host_config and create_container_config to Client for version awareness Trigger warning when create_host_config is used without version
* | | | | Split the entrypoint string to shell-like syntax.Colin Huang2015-08-251-0/+3
|/ / / /