summaryrefslogtreecommitdiff
path: root/docker/models
Commit message (Collapse)AuthorAgeFilesLines
* Style fixes. Copied docs to APIClient as wellJoffrey F2017-11-061-3/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* explain the socket parameter of exec_runMartin Monperrus2017-11-061-3/+5
| | | | Signed-off-by: Martin Monperrus <martin.monperrus@gnieh.org>
* Add support for insert_defaults in inspect_serviceJoffrey F2017-11-061-2/+9
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Update SwarmSpec to include new parametersJoffrey F2017-11-031-3/+14
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for scope filter in inspect_networkJoffrey F2017-11-021-3/+11
| | | | | | Fix missing scope implementation in create_network Signed-off-by: Joffrey F <joffrey@docker.com>
* Improve docs for service list filtersAlessandro Baldo2017-11-011-1/+2
| | | | | | | | - add "label" and "mode" to the list of available filter keys in the high-level service API - add "label" and "mode" to the list of available filter keys in the low-level service API - add integration tests Signed-off-by: Alessandro Baldo <git@baldoalessandro.net>
* Add support for configs managementJoffrey F2017-10-261-0/+69
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for new ContainerSpec parametersJoffrey F2017-10-261-6/+31
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for extra_hosts option in buildJoffrey F2017-10-251-0/+4
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add support for mounts in HostConfigJoffrey F2017-10-241-0/+5
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Adding swarm id_attribute to match docker outputSteve Clark2017-09-211-0/+2
| | | | | Swarm id is returned in a attribute with the key ID. The swarm model was using the default behaviour and looking for Id. Signed-off-by: Steve Clark <steve@cobe.io>
* Fix docs, incorrect param namebrett552017-09-211-1/+1
| | | | Signed-off-by: brett55 <bjcull2@gmail.com>
* Merge branch 'master' of github.com:docker/docker-pyJoffrey F2017-08-151-1/+1
|\
| * Use collection's get method inside ImageCollection's list methodadrianliaw2017-08-151-1/+1
| | | | | | | | Signed-off-by: Adrian Liaw <adrianliaw2000@gmail.com>
* | Use better version comparison functionJoffrey F2017-08-151-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-151-2/+8
|/ | | | | | both are set. Continue raising an exception for api versions <1.25. Signed-off-by: David Steines <d.steines@gmail.com>
* Return generator for output of load_image endpointJoffrey F2017-08-151-0/+3
| | | | Signed-off-by: Joffrey F <joffrey@docker.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>
* Add support for ContainerSpec.TTYJoffrey F2017-06-211-0/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add network_mode support to Client.build1397-build-networkJoffrey F2017-06-191-4/+7
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1626 from datwiz/images-build-error-1625Joffrey F2017-06-191-3/+4
|\ | | | | fix #1625 where ImageCollection.build() could return with incorrect image id
| * fix #1625 where ImageCollection.build() could return early with incorrect ↵Chris Ottinger2017-05-271-3/+4
| | | | | | | | image_id depending on docer build output Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com>
* | Add support for start_period in Healthcheck spechealthcheck-start-periodJoffrey F2017-06-161-0/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1617 from docker/create-ingress-networkJoffrey F2017-06-161-0/+2
|\ \ | | | | | | Add support for ingress in create_network
| * | Add support for ingress in create_networkcreate-ingress-networkJoffrey F2017-05-171-0/+2
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1629 from shin-/1610-docfixJoffrey F2017-06-161-3/+0
|\ \ | | | | | | Fix misleading build method docs
| * | Fix misleading build method docsJoffrey F2017-05-301-3/+0
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1631 from madhuri-rai07/masterJoffrey F2017-06-161-0/+2
|\ \ | | | | | | Add support for ``runtime`` config
| * | 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
| |/
* | Closes #1588, image.tag does not return anythingOlivier Sallou2017-06-161-1/+1
|/ | | | | | This patch returns the check made against api when tagging an image as stated in documentation Signed-off-by: Olivier Sallou <olivier.sallou@irisa.fr>
* Add `target` argument to image buildingYong Wen Chua2017-05-161-0/+2
| | | | | | | | | | This is related to the multi-stage image building that was introduced in 17.05 (API 1.29). This allows a user to specify the stage of a multi-stage Dockerfile to build for, rather than the final stage. Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
* Fix docstring of ImageCollection.getYusuke Miyazaki2017-05-141-2/+2
| | | | Signed-off-by: Yusuke Miyazaki <miyazaki.dev@gmail.com>
* Replace erroneous networks argument in containers.run with singular1433-run-networksJoffrey F2017-05-122-9/+18
| | | | | | | | network equivalent. Small docfixes Signed-off-by: Joffrey F <joffrey@docker.com>
* Include tag in images.get after pulling if provided separately1585-pull-tagJoffrey F2017-05-091-3/+3
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Improve build result detectionJoffrey F2017-05-051-4/+7
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch '1577-multi-success-message' of ↵Joffrey F2017-05-051-12/+12
|\ | | | | | | https://github.com/aaronthebaron/docker-py into aaronthebaron-1577-multi-success-message
| * Better error handling, itterate on json stream directly.Aaron Cowdin2017-05-031-8/+7
| | | | | | | | Signed-off-by: Aaron Cowdin <aaron.cowdin@gmail.com>
| * Handle multiple success messages during image building.Aaron Cowdin2017-04-281-7/+8
| | | | | | | | Signed-off-by: Aaron Cowdin <aaron.cowdin@gmail.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>
* | Merge pull request #1493 from funkyfuture/model_propertiesJoffrey F2017-04-272-0/+26
|\ \ | | | | | | Adds a few model properties
| * | 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 image modelFrank Sachsenheim2017-04-151-0/+8
| | | | | | | | | | | | 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>
* | FormattingJoffrey F2017-04-271-8/+6
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>