summaryrefslogtreecommitdiff
path: root/docker/utils
Commit message (Collapse)AuthorAgeFilesLines
* Handle decimal values in parse_bytes813-parse-float-bytesJoffrey F2015-12-181-2/+14
| | | | | | Also ensure we are able to handle 64-bit integers in py2 Signed-off-by: Joffrey F <joffrey@docker.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>
* | allow interactive execTomas Tomecek2015-12-031-2/+2
|/ | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* 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>
* | Merge pull request #834 from lots0logs/814-host-config-mem-swapDaniel Nephin2015-11-161-10/+24
|\ \ | | | | | | Add support for MemorySwappiness to client.create_host_config()
| * | Incorporates feedback from and closes #814Dustin Falgout2015-11-051-10/+24
| |/ | | | | | | Signed-off-by: Dustin Falgout <dustin@falgout.us>
* | Merge upstream branch 'master' into feature/logs_sinceViacheslav Boiko2015-11-052-7/+32
|\ \ | |/ | | | | Signed-off-by: Viacheslav Boiko <v.e.boyko@gmail.com>
| * 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-262-3/+9
| | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
| * put/get archive implementationJoffrey F2015-10-082-1/+9
| | | | | | | | 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>
* | Support the 'since' option in the 'containers/<id>/logs' endpointViacheslav Boiko2015-10-021-1/+1
|/ | | | Signed-off-by: Viacheslav Boiko <v.e.boyko@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>
* Generic skip decorator for low API version accessible to all testsJoffrey F2015-09-163-2/+27
| | | | | | | | | | 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>
* | Merge pull request #721 from aanand/pathspecJoffrey F2015-08-262-27/+70
|\ \ | | | | | | Better support for .dockerignore
| * | Better support for .dockerignoreAanand Prasad2015-08-262-27/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | 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
* | 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-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>
* | | 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>
View Lorry Controller Status