summaryrefslogtreecommitdiff
path: root/docker/models/containers.py
Commit message (Collapse)AuthorAgeFilesLines
* Correctly parse volumes with Windows paths1884-create_volumes_win32Joffrey F2018-01-311-9/+15
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Move ExecResult definition to models.containersJoffrey F2018-01-291-5/+12
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Container.exec_run returns a namedtuple w/ attrs exit_code & outputFrank Sachsenheim2018-01-281-5/+6
| | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
* Container.exec_run returns None as exit_code if stream or socketFrank Sachsenheim2018-01-281-5/+7
| | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
* Return tuple instead of dict in exec_runJoffrey F2018-01-261-7/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'add_exit_code_to_exec_run' of ↵Joffrey F2018-01-261-5/+16
|\ | | | | | | https://github.com/hnq90/docker-py into hnq90-add_exit_code_to_exec_run
| * Add exit code to exec_runHuyNQ2017-11-131-5/+16
| | | | | | | | Signed-off-by: HuyNQ <huy@huynq.net>
* | Bump default API version to 1.35Joffrey F2018-01-261-2/+7
| | | | | | | | | | | | | | | | | | Add ContainerSpec.isolation support Add until support in logs Add condition support in wait Add workdir support in exec_create Signed-off-by: Joffrey F <joffrey@docker.com>
* | Replace missing "^" with "e"mccalluc2018-01-261-1/+1
| | | | | | Signed-off-by: Chuck McCallum <mccallucc+github@gmail.com>
* | Add support for experimental platform flag in build and pull1855-platform-optionJoffrey F2018-01-231-2/+6
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Don't attempt to retrieve container's stderr if `auto_remove` was set1813-autoremove-errorJoffrey F2017-12-191-1/+3
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Retrieve container logs before container exits / is removed1813-run-autoremoveJoffrey F2017-12-141-10/+19
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge branch 'master' of https://github.com/tz70s/docker-py into tz70s-masterJoffrey F2017-12-131-0/+2
|\ \ | |/ |/| | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Fix #1575 - Add cpu_rt_period and cpu_rt_runtime argsTzu-Chiao Yeh2017-08-131-0/+2
| | | | | | | | | | | | | | Add cpu_rt_period and cpu_rt_runtime in hostconfig with version(1.25), types(int) checks. Also add version and type checks in dockertype unit test. Signed-off-by: Tzu-Chiao Yeh <su3g4284zo6y7@gmail.com>
| * client.containers.run returns None if none of json-file or journald logging ↵Artem Bolshakov2017-08-071-1/+15
| | | | | | | | | | | | drivers used Signed-off-by: Artem Bolshakov <either.free@gmail.com>
* | Style fixes. Copied docs to APIClient as wellJoffrey F2017-11-071-3/+4
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | explain the socket parameter of exec_runMartin Monperrus2017-11-071-3/+5
| | | | | | | | Signed-off-by: Martin Monperrus <martin.monperrus@gnieh.org>
* | Add support for mounts in HostConfigJoffrey F2017-11-071-0/+5
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Use better version comparison functionJoffrey F2017-08-171-3/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Allow detach and remove for api version >= 1.25 and use auto_remove when ↵David Steines2017-08-171-2/+8
| | | | | | | | | | | | both are set. Continue raising an exception for api versions <1.25. Signed-off-by: David Steines <d.steines@gmail.com>
* | client.containers.run returns None if none of json-file or journald logging ↵Artem Bolshakov2017-08-171-1/+15
|/ | | | | | drivers used Signed-off-by: Artem Bolshakov <either.free@gmail.com>
* Add support for start_period in Healthcheck spechealthcheck-start-periodJoffrey F2017-06-161-0/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix test cases for ``runtime`` configMadhuri Kumari2017-06-071-1/+1
| | | | Signed-off-by: Madhuri Kumari <madhuri.kumari@intel.com>
* Add support for ``runtime`` in container create and run APIMadhuri Kumari2017-06-011-0/+2
|
* Replace erroneous networks argument in containers.run with singular1433-run-networksJoffrey F2017-05-121-7/+16
| | | | | | | | network equivalent. Small docfixes Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'add-env-support-to-exec' of ↵Joffrey F2017-05-021-2/+5
|\ | | | | | | | | | | https://github.com/TomasTomecek/docker-py into TomasTomecek-add-env-support-to-exec Signed-off-by: Joffrey F <joffrey@docker.com>
| * exec: add support for `Env`Tomas Tomecek2017-04-291-2/+5
| | | | | | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | Add missing support for `CpusetMems` parameter to HostConfig.Dan Liew2017-05-011-0/+3
| | | | | | | | Signed-off-by: Dan Liew <daniel.liew@imperial.ac.uk>
* | Merge pull request #1570 from AlexeyRokhin/masterJoffrey F2017-04-281-0/+7
|\ \ | |/ |/| Add cpu_count, cpu_percent, nano_cpus parameters to container HostConfig.
| * cpus renamed to nano_cpus. Type and scale of nano_cpus are changed. Comments ↵Alexey Rokhin2017-04-281-4/+5
| | | | | | | | | | | | for new parameters are changed. Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
| * Add cpu_count, cpu_percent, cpus parameters to container HostConfig.Alexey Rokhin2017-04-191-0/+6
| | | | | | | | Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
* | Adds an 'image' property to the container modelFrank Sachsenheim2017-04-151-0/+10
| | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
* | Adds a 'labels' property to the container modelFrank Sachsenheim2017-04-151-0/+8
|/ | | | | | | | The Docker API seems to respond with a 'null' value for the 'Labels' attribute from containers that were created with older Docker versions. An empty dictionary is returned in this case. Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
* Merge pull request #1557 from ewanbarr/patch-1Joffrey F2017-04-101-1/+1
|\ | | | | Minor typo correction
| * Minor typo correctionewanbarr2017-04-081-1/+1
| | | | | | | | | | | | The stdout argument name was repeated in the run method docstring. The second should be replaced by stderr. Signed-off-by: Ewan Barr <ewan.d.barr@googlmail.com>
* | removed duplicate mem_limit arg desc; type now consistent accross models ↵Peter Slovak2017-04-071-3/+1
| | | | | | | | | | | | (float->int) Signed-off-by: Peter Slovak <peter.slovak@websupport.sk>
* | docs renames: cpu_group->cpu_period, cpu_period->cpu_quotaPeter Slovak2017-04-071-2/+2
|/ | | | Signed-off-by: Peter Slovak <peter.slovak@websupport.sk>
* Docstring fixes for init and init_pathJoffrey F2017-03-011-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add init_path parameter to container HostConfigTomasz Madycki2017-03-011-0/+2
| | | | Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
* Add init parameter to container HostConfigTomasz Madycki2017-03-011-0/+3
| | | | Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
* removed unused/typoed param from models.containers.list docstringBen Doan2017-02-261-1/+1
| | | | Signed-off-by: Ben Doan <ben@bendoan.me>
* Merge pull request #1459 from shin-/1300-storageoptsJoffrey F2017-02-151-0/+3
|\ | | | | Add support for storage_opt in host_config
| * Add support for storage_opt in host_configJoffrey F2017-02-151-0/+3
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Fix passing volumes to run with no host pathBen Firshman2017-02-071-1/+11
| | | | | | | | | | | | | | | | | | Technically we shouldn't be passing them as binds, but the daemon doesn't seem to mind. Fixes #1380 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Fix volume path passed by run to create_containerBen Firshman2017-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Seems like this is pretty much ignored by Docker, so it wasn't causing any visible issues, except when a volume name was used instead of a path. Also, added integration tests. Ref #1380 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Add prune_images methodJoffrey F2017-01-301-14/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add prune_containers methodJoffrey F2017-01-301-0/+17
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Change "Remote API" to "Engine API"Ben Firshman2017-01-301-1/+1
| | | | | | | | This is currently inconsistent, but mostly called "Engine API". For the release of Docker 1.13, this will be "Engine API" all over the Engine documentation, too. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Add support for auto_remove in HostConfigautoremove_supportJoffrey F2017-01-251-0/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Remove duplicate line in exec_run documentationMehdi Bayazee2017-01-251-1/+0
| | | | Signed-off-by: Mehdi Bayazee <bayazee@gmail.com>