summaryrefslogtreecommitdiff
path: root/docker/utils/utils.py
Commit message (Collapse)AuthorAgeFilesLines
* Send LinkLocalIPs as part of IPAMConfig dictionarycompose-3757-linklocal-fixJoffrey F2016-07-251-4/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for link-local IPs in endpoint config1107-link-local-ipsJoffrey F2016-06-241-1/+9
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1066 from yunzhu-li/blkio-controlJoffrey F2016-06-151-2/+58
|\ | | | | Add support for Block IO constraints in HostConfig
| * Add support for Block IO constraints in HostConfigyunzhu-li2016-06-051-2/+58
| | | | | | | | | | | | | | | | | | | | | | | | This adds support for Block IO constraint options: - blkio-weight - blkio-weight-device - device-read-bps - device-write-bps - device-read-iops - device-write-iops Signed-off-by: yunzhu-li <contact@yunzhu.li>
* | Merge pull request #1079 from docker/1024-npipe-supportJoffrey F2016-06-141-3/+6
|\ \ | | | | | | npipe support
| * | Update parse_host and testsJoffrey F2016-06-021-2/+2
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Experimental npipe:// supportJoffrey F2016-06-021-1/+4
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add ipv[46]_address params to create_endpoint_config.Joffrey F2016-06-131-5/+16
|/ | | | | | Update networks documentation with exhaustive API docs Signed-off-by: Joffrey F <joffrey@docker.com>
* support Python 3.5Thomas Grainger2016-05-191-8/+2
| | | | Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
* Resolve path traversal in .dockerignore patternsAanand Prasad2016-05-161-0/+3
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge pull request #1004 from klj613/allow-equals-character-in-env-fileJoffrey F2016-04-271-1/+1
|\ | | | | makes it possible to have '=' in the env file
| * makes it possible to have '=' in the env fileKristian Lewis Jones2016-03-221-1/+1
| | | | | | | | | | | | note that the docker command line flag --env-file also allows '=' in the env file Signed-off-by: Kristian Lewis Jones <klj613@kristianlewisjones.com>
* | Add an option to gzip tar files.Michael Sander2016-03-221-2/+2
| | | | | | | | | | | | This can be used to make building much faster. Signed-off-by: speedplane <mes65@cornell.edu>
* | Support OomScoreAdj in host configurationAditya Marella2016-03-221-1/+10
| | | | | | | | Signed-off-by: Aditya Marella <aditya.marella@gmail.com>
* | Support passing an alternate environment dict to kwargs_from_envkwargs_from_env_altJoffrey F2016-03-211-4/+6
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* If tcp host is provided while TLS is enabled, convert to httpstcp-to-https-parsehostJoffrey F2016-03-171-2/+3
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Don't support tmpfs in API version < 1.22Aanand Prasad2016-03-161-0/+2
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Clarify error messages when bad values are passed in for tmpfsAanand Prasad2016-03-161-2/+4
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Add support for Tmpfs declaration in Hostconfig.Jan Losinski2016-03-161-1/+31
| | | | | | | This adds support for the Tmpfs option introduced in Docker 1.10. See: https://github.com/docker/docker/pull/13587 Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
* Fix enable_tls issue #984Joffrey F2016-03-111-4/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #916 from docker/container_update_featureJoffrey F2016-02-241-39/+35
|\ | | | | Support for container limits update
| * Improve parse_bytes util methodcontainer_update_featureJoffrey F2016-02-231-39/+35
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Fix env vars with empty values.Daniel Nephin2016-02-241-1/+1
| | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | Format environment variables to match docker-cli.Daniel Nephin2016-02-231-4/+9
|/ | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* Fix TLS regressionsAanand Prasad2016-02-231-1/+1
| | | | | | | | | - Set `verify` to the CA cert path if one has been specified, rather than `True` - Don't set `assert_fingerprint` Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Never exclude Dockerfile from the build context.926-ignored_dockerfilesJoffrey F2016-02-091-1/+7
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Re-write kwargs_from_env to handle TLS options betterMike Dougherty2016-02-041-11/+30
| | | | | | | | This more closely matches the way the docker client interprets the relevant environment variables. Among other things, it's now possible to set DOCKER_TLS_VERIFY=false. Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
* Add support for shm_size.Spencer Rinehart2016-02-041-1/+8
| | | | | | | --shm-size was added to Docker in 1.10 via docker/docker#16168. See docker/compose#2823 for more details. Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
* 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>
View Lorry Controller Status