summaryrefslogtreecommitdiff
path: root/docker/utils/utils.py
Commit message (Collapse)AuthorAgeFilesLines
* Update outdated error message914_hostconfig_startJoffrey F2016-01-291-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Support unspecified protocol in base_url when using TLS894-docker_host_envJoffrey F2016-01-281-2/+2
| | | | | | (assume HTTPS) Signed-off-by: Joffrey F <joffrey@docker.com>
* Support links when creating containers or connecting to networksAanand Prasad2016-01-201-7/+14
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* parse_bytes: Add ability to handle 64-bit integers in py2Joffrey F2016-01-181-11/+18
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Improve host devices supportJoffrey F2016-01-181-5/+14
| | | | | | | | Add unit tests for utils.parse_devices Rewrite documentation Support dict and string format for device declaration Signed-off-by: Joffrey F <joffrey@docker.com>
* Normalise/fix networking API JSON keysAanand Prasad2016-01-181-6/+6
| | | | | | | - Use CamelCase - `auxaddresses` -> `AuxiliaryAddresses` Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Implement support for network-scoped aliasesAanand Prasad2016-01-141-1/+22
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* allow custom ipam options when creating networksRyan Belgrave2016-01-041-0/+17
| | | | Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
* Merge pull request #863 from thomasboyt/fast-exclude-pathsAanand Prasad2015-12-161-21/+51
|\ | | | | Don't descend into ignored directories when building context
| * Improve get_paths performance by not descending into ignored directoriesThomas Boyt2015-12-081-21/+51
| | | | | | | | Signed-off-by: Thomas Boyt <thomas@ledgerx.com>
* | Merge pull request #868 from jstewmon/config-stop-signalJoffrey F2015-12-081-1/+7
|\ \ | | | | | | added stop_signal to create container config
| * | added stop_signal to create container configJonathan Stewmon2015-12-031-1/+7
| | | | | | | | | | | | Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
* | | Merge pull request #865 from dlorenc/masterJoffrey F2015-12-081-5/+6
|\ \ \ | |_|/ |/| | Allow utils.tar to take an existing file object.
| * | Allow utils.tar to take an existing file object.dlorenc2015-11-301-5/+6
| |/ | | | | | | Signed-off-by: dlorenc <lorenc.d@gmail.com>
* | incorporate feedbackDustin Falgout2015-12-041-30/+40
| | | | | | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
* | Use new methods to raise exceptions in create_host_config.Dustin Falgout2015-12-031-36/+13
| | | | | | | | | | | | | | Added tests for the new methods. Closes #840 Signed-off-by: Dustin Falgout <dustin@falgout.us>
* | resolve merge conflictDustin Falgout2015-12-031-10/+23
|/ | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
* Update auth.resolve_repository_nameJoffrey F2015-11-231-10/+8
| | | | | | | | | | | More relaxed version that matches the constraints imposed by the current version of the docker daemon. Few unit tests to verify the new cases. Client.pull was trying to set the tag value when it wasn't supposed to, fixed now. utils.parse_repository_tag is simpler and supports @sha... notation Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'oom-kill-disable-pr' of https://github.com/schu/docker-py into ↵Joffrey F2015-11-181-10/+17
|\ | | | | | | schu-oom-kill-disable-pr
| * create_host_config: allow setting oom_kill_disableMichael Schubert2015-11-101-1/+8
| | | | | | | | Signed-off-by: Michael Schubert <schu@schu.io>
* | Incorporates feedback from and closes #814Dustin Falgout2015-11-051-10/+24
|/ | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
* Fix py3.2 test failure and unicode behaviorJoffrey F2015-10-271-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Support unicode commands.Daniel Nephin2015-10-261-2/+8
| | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* put/get archive implementationJoffrey F2015-10-081-0/+8
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Don't break when volume binds contain unicode characters782-unicode-volume-pathsJoffrey F2015-09-251-4/+15
| | | | | | Also includes a few unit tests for utils.convert_volume_binds Signed-off-by: Joffrey F <joffrey@docker.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>
* Generic skip decorator for low API version accessible to all testsJoffrey F2015-09-161-0/+8
| | | | | | | | | | 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>
* 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 #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
| |
* | Default to 127.0.0.1:2375 on WindowsAanand Prasad2015-09-011-1/+5
|/ | | | | | Following the logic of the Docker client. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* 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>
* | Better support for .dockerignoreAanand Prasad2015-08-261-26/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | Merge pull request #732 from docker/version-dependent-hostconfigAanand Prasad2015-08-251-2/+10
|\ \ | | | | | | Version dependent hostconfig
| * | Add version param to utils.create_host_configJoffrey F2015-08-241-2/+10
| | | | | | | | | | | | | | | | | | 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
* | 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-101-0/+2
|\ \ | | | | | | `network_mode` now necessary in `host_config`
| * | Moved network_mode default to create_host_config ; small fix to preserve ↵Joffrey F2015-07-291-10/+2
| | | | | | | | | | | | blank host_config in start if no option is provided
| * | Add netmode (required by docker)John Howard2015-07-281-0/+10
| | | | | | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | | unpack key-value pairJoffrey F2015-08-041-2/+1
| | |
* | | Squashed commit of the following:Viktor Petersson2015-07-301-0/+27
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #680 from aanand/fix-timestamp-conversionJoffrey F2015-07-211-3/+3
|\ \ | |/ |/| Enforce UTC datetimes in arguments to `events()`
| * Enforce UTC datetimes in arguments to `events()`Aanand Prasad2015-07-211-3/+3
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
View Lorry Controller Status