summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
|/ / / /
* | | | Added support for cgroup parentMohit Soni2015-08-241-1/+4
| | | | | | | | | | | | | | | | Clean up cgroup_parent usage
* | | | Merge pull request #711 from ClusterHQ/exec_inspect_versionJoffrey F2015-08-241-2/+4
|\ \ \ \ | | | | | | | | | | Change minimum API version for exec_inspect
| * | | | Update error message to state that exec_inspect is not supportedBridget McErlean2015-08-121-1/+3
| | | | |
| * | | | Change minimum API version for exec_inspectBridget McErlean2015-08-121-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #728 from aanand/debug-authJoffrey F2015-08-242-6/+49
|\ \ \ \ | | | | | | | | | | Add logging for auth loading/resolution
| * | | | Add logging for auth loading/resolutionAanand Prasad2015-08-202-6/+49
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | | Fixed #726 issue where split_port was checking `len(None)`Mark Adams2015-08-191-6/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | - Fixed #726 by adding a check for None in split_port - Also switched to using a _raise_invalid_port() function to replace multiple slightly differing ValueErrors for invalid port
* | | | add gelf and fluentd logging drivers to types.pyBrian Edwards2015-08-181-1/+3
| | | |
* | | | Allow docker host (base_url) to contain a pathJoffrey F2015-08-171-2/+7
|/ / /
* | | Merge pull request #698 from docker/jhowardmsft-14530-netmodeJoffrey F2015-08-102-10/+14
|\ \ \ | | | | | | | | `network_mode` now necessary in `host_config`
| * | | Explicited start config tricksjhowardmsft-14530-netmodeJoffrey F2015-08-101-11/+13
| | | |
| * | | Moved network_mode default to create_host_config ; small fix to preserve ↵Joffrey F2015-07-292-11/+3
| | | | | | | | | | | | | | | | blank host_config in start if no option is provided
| * | | development version suffixJoffrey F2015-07-291-1/+1
| | | |
| * | | Merge branch '14530-netmode' of https://github.com/jhowardmsft/docker-py ↵Joffrey F2015-07-291-0/+10
| |\ \ \ | | | | | | | | | | | | | | | into jhowardmsft-14530-netmode
| | * | | Add netmode (required by docker)John Howard2015-07-281-0/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | | | | Merge pull request #703 from erikced/journald-log-driverAanand Prasad2015-08-051-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Add journald log driver support
| * | | | | Add journald log driver supportErik Cederberg2015-08-031-1/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Erik Cederberg <erikced@gmail.com>
* | | | | unpack key-value pairJoffrey F2015-08-041-2/+1
| | | | |
* | | | | dev versionJoffrey F2015-08-041-1/+1
| | | | |
* | | | | Squashed commit of the following:Viktor Petersson2015-07-302-1/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4f053a06c1e9e3f63fd5afde60322f676acbdf45 Merge: 9177380 07a99ea Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 14:37:16 2015 +0100 Merge branch 'master' into fixes commit 9177380ae9abf4ca01cf7a2a8b7de6640ed5f5d5 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 14:00:51 2015 +0100 Tweaks exception message. commit 6a5832e2f6655835a6b87897d7ec82d6ef5faa50 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 13:17:32 2015 +0100 Simplifies logic as per feedback. commit f750eddc34e5356dcfb53c16a7f98a99e817fa53 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 11:09:14 2015 +0100 Move return from list to dict. Adds exception handling. commit 8e50f57cceb6370b7f7b41624f50d5a6835301a0 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 10:15:58 2015 +0100 Reverts change to .gitignore. commit 5ba2c1b29706ddb74bef9c24c2a6e64bb369db22 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 21:15:21 2015 +0100 Fixes feedback. Adds three unittests. commit e1c719e61993fdaec0f22ba0de706af80587dc16 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 17:00:16 2015 +0100 WIP Adds test for parse_env_file commit 4448ae72e55d889d9d194a2c0303d182cb157d4c Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 16:42:49 2015 +0100 Excludes coverage files. commit 19a5d01615dd9b7ee939f54f256e5bae89a94ee1 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 16:42:42 2015 +0100 Switch fixes logic. commit a8094c63a9f4351ae71393ea5603aa11c5c5bc94 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:45:56 2015 +0100 Implements logic for envfile parsing from Docker-cli Ref: https://github.com/docker/docker/blob/master/opts/envfile.go#L19-L51 commit ea9bfd95dfafe4023c58ab37f990158f73eb2e0d Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:41:23 2015 +0100 Replaces CSV module with manual splitting. commit a001d28ff48309d2b2338aaf27253fdfaa0f6c4b Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:35:37 2015 +0100 Removes isinstance on filename. commit 419d5961f6103df9166be3a9baa549276c12223d Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 22:39:33 2015 +0100 Reflects @aanand's feedback. commit e81e3c8ed797ff939843d2485bf15525e85e890d Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 15:43:32 2015 +0100 Typo fix. commit 2898389cada2bfca64bdfa71359aebeb3b5b6d1b Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 15:41:08 2015 +0100 Refs #565. Adds minimal implementation of env_file client-side support.
* | | | Bumped versionJoffrey F2015-07-221-1/+1
|/ / /
* | | Merge pull request #682 from docker/moutten-fix-build-authJoffrey F2015-07-222-9/+8
|\ \ \ | | | | | | | | Switch to send full AuthConfig object for build action
| * | | Make build auth work with API versions < 1.19 toomoutten-fix-build-authJoffrey F2015-07-201-3/+8
| | | |
| * | | Merge branch 'fix-build-auth' of https://github.com/moutten/docker-py into ↵Joffrey F2015-07-202-7/+1
| |\ \ \ | | | | | | | | | | | | | | | moutten-fix-build-auth
| | * | | Switch to send full AuthConfig object for build actionMatt Outten2015-07-172-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support the docker API for version 1.7+, this command changes the way the `X-Registry-Config` header is sent when attempting to build an image.
View Lorry Controller Status