summaryrefslogtreecommitdiff
path: root/docker/utils/utils.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #644 from docker/memory-memswap-hostconfigJoffrey F2015-06-301-7/+32
|\ | | | | memory / memswap in hostconfig
| * Moved mem_limit and memswap_limit to host_config for API version >= 1.19Joffrey F2015-06-191-7/+32
| |
* | Support 401 status for v2 registry endpointJoffrey F2015-06-191-3/+6
| |
* | Merge branch 'master' of https://github.com/cesanta/docker-py into ↵Joffrey F2015-06-191-1/+3
|\ \ | |/ |/| | | cesanta-master
| * Fix pinging an unauthenticated v2 registryMarko Mikulicic2015-05-291-1/+3
| |
* | Merge pull request #614 from ibuildthecloud/extra-host-listJoffrey F2015-06-181-1/+1
|\ \ | | | | | | Allow extra_hosts to be a list too
| * | Allow extra_hosts to be a list tooDarren Shepherd2015-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The current map syntax does not allow the API equivalent of --add-host foo:1.1.1.1 --add-host foo:2.2.2.2 The above will map one hostname to two IPs. The above is valid in Docker.
* | | Merge branch 'allow-any-mode' of https://github.com/aanand/docker-py into ↵Joffrey F2015-06-181-1/+14
|\ \ \ | | | | | | | | | | | | aanand-allow-any-mode
| * | | Allow any mode string to be passed into a volume bindAanand Prasad2015-06-051-1/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | Volume binds now take a "mode" key, whose value can be any string. "ro" is still supported. It is an error to specify both "ro" and "mode". Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Only allow volume_driver param if API version >= 1.19Joffrey F2015-06-181-3/+8
| | |
* | | Add volume_driver param to client.create_containerLuke Marsden2015-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | | - Add appropriate test which also asserts that volume names can be passed through to drivers. - Add new param to docs. Signed-off-by: Luke Marsden <luke@clusterhq.com>
* | | Allow binds to be specified as a list of stringsAanand Prasad2015-06-121-0/+3
|/ / | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Typo in ReadonlyRootfsDarren Shepherd2015-05-251-1/+1
|/ | | | read_only parameter does not work because the wrong name is sent to Docker
* Merge pull request #562 from smothiki/memsJoffrey F2015-05-201-0/+3
|\ | | | | make memory units compatible with native docker cli
| * make memory units compatible with native docker clismothiki2015-05-071-0/+3
| | | | | | | | Signed-off-by: sivaram mothiki <smothiki@engineyard.com>
* | Set 'CpusetCpus' with the value of the cpuset param in create_containerJoffrey F2015-05-081-0/+1
|/
* Merge pull request #563 from docker/logconfig-supportJoffrey F2015-04-241-3/+14
|\ | | | | Logconfig support
| * Added log_config support in host configJoffrey F2015-04-241-3/+14
| |
* | v2 doesn't have a /_ping endpoint, use /v2/ instead. Fixes #549Joffrey F2015-04-241-1/+1
|/
* Add support for ulimits in host_configJoffrey F2015-04-221-1/+13
|
* Modify expand_registry_url to support v2 private registries.support_v2_private_registryJoffrey F2015-04-221-0/+4
|
* IPC sharing implementationYaroslav Molochko2015-03-301-1/+5
|
* Added some type and version checks; removed security_opt from ↵Joffrey F2015-03-251-2/+6
| | | | container_config (as this is invalid)
* Add security_opt for create/startEric Windisch2015-03-241-3/+7
| | | | Signed-off-by: Eric Windisch <eric@windisch.us>
* Finish labels implementation, add tests and docsAanand Prasad2015-03-201-6/+5
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Implemented labels for docker-pyAndré Martins2015-03-171-2/+13
| | | | Signed-off-by: André Martins <martins@noironetworks.com>
* Merge pull request #488 from docker/memoryswapJoffrey F2015-02-111-0/+140
|\ | | | | Container config cleanup
| * * Moved _container_config to utils.create_container_configmemoryswapJoffrey F2015-02-111-0/+140
| | | | | | | | * memswap_limit can now be provided as a string, similar to mem_limit
* | Merge pull request #486 from nir0s/fix-old-style-string-formattingJoffrey F2015-02-111-8/+10
|\ \ | |/ |/| Fix old style string formatting
| * fixesnir0s2015-02-111-2/+2
| |
| * fixed string formatting in utilsnir0s2015-02-111-8/+10
| |
* | Added support for pid_mode paramJoffrey F2015-02-111-1/+8
| |
* | Merge pull request #480 from ggtools/eventsJoffrey F2015-02-111-0/+8
|\ \ | | | | | | Add missing options to the events command
| * | Fix datetime issue with Python 2.6Christophe Labouisse2015-02-111-1/+3
| | | | | | | | | | | | Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
| * | Add missing options to the events commandChristophe Labouisse2015-02-111-0/+6
| |/ | | | | | | | | | | | | - Add since, until and filters parameters to `Client.events` - Add missing `events`command in the documentation Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
* | read_only parameterread_only_rootfsJoffrey F2015-02-101-1/+4
|/
* fix create_host_config methodbernardopericacho2015-01-161-5/+5
|
* Use create_host_config in start (unifying parameter processing)0.7.0-releaseJoffrey F2014-12-181-7/+10
|
* Added support for extra_hosts in create_host_configJoffrey F2014-12-181-1/+11
|
* Fixed VolumesFrom bugJoffrey F2014-12-171-1/+1
|
* Added create_host_config helper in docker.utilsJoffrey F2014-12-171-0/+67
|
* Merge pull request #429 from dims/masterJoffrey F2014-12-171-1/+1
|\ | | | | Devices should be separated by colon separated string
| * Devices should be separated by colon separated stringDavanum Srinivas2014-12-171-1/+1
| | | | | | | | | | | | Totally bad test :( (written by me). The documentation and code should match now. Many thanks to pranavs18 for spotting the error and proposing the fix.
* | Merge pull request #271 from robertglen/byteIO-seekfixJoffrey F2014-12-151-0/+2
|\ \ | |/ |/| Fixed bug in utils.mkbuildcontext for BytesIO Dockerfiles
| * Should be done for StringIO objects as wellRobert Glen2014-07-101-0/+1
| |
| * Fixed bug in utils.mkbuildcontext for BytesIO DockerfilesRobert Glen2014-07-091-0/+1
| | | | | | | | | | | | - resetting dockerfile seek position to 0 after dockerfile.getvalue() is called - prevents traceback on line utils.py line 43 - 'IOError("end of file reached")' in tarfile.py
* | Walk file tree in order for deterministic buildsMarcus Cobden2014-11-041-1/+2
| | | | | | Python's `os.walk` does not order the lists of files and directories it returns, so in order to produce a consistent build context tarfile, they should be ordered.
* | Merge branch 'filters' of github.com:irachex/docker-py into irachex-filtersJoffrey F2014-11-031-0/+12
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: docker/utils/__init__.py docker/utils/utils.py tests/utils_test.py
| * | Add support for filtering images and containersHuayi Zhang2014-10-051-0/+12
| | | | | | | | | | | | | | | | | | | | | [`filters` is a json encoded value of the filters (a map[string][string]) to process on the images list. ][1] The tricky thing is that we must convert boolean value to string and any filter value to list to make a `map[string][string]` json format [1]: https://docs.docker.com/reference/api/docker_remote_api_v1.14/#list-images
* | | utils: add kwargs_from_envJohan Euphrosine2014-10-291-0/+22
| | |
View Lorry Controller Status