summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add support for ingress in create_networkcreate-ingress-networkJoffrey F2017-05-172-1/+14
| | | | | | | | | | | | | | | | 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-163-5/+15
|\ \ \ \ | | | | | | | | | | Add support for ``runtime`` config
| * | | | Fix test cases for ``runtime`` configMadhuri Kumari2017-06-073-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Madhuri Kumari <madhuri.kumari@intel.com>
| * | | | Add support for ``runtime`` in container create and run APIMadhuri Kumari2017-06-013-5/+13
| |/ / /
* | | | Merge pull request #1632 from kaiyou/masterJoffrey F2017-06-161-67/+40
|\ \ \ \ | | | | | | | | | | allow ipv6 :: notation in split_port (using re)
| * | | | Rewrite the split_port function using rekaiyou2017-06-051-67/+40
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of a defined format with specific parts, a regular expression with named capturing bits make reasoning about the parts simpler than imlementing a parser from scratch. Signed-off-by: kaiyou <pierre@jaury.eu>
* | | | Merge pull request #1648 from ChrsMark/masterJoffrey F2017-06-161-0/+5
|\ \ \ \ | | | | | | | | | | Raising error in case of invalid value of since kwarg on Container.logs
| * | | | Raising error in case of invalid value of since kwarg on Container.logsChris Mark2017-06-161-0/+5
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Chris Mark <chrismarkou92@gmail.com>
* | | | 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>
* | | Merge pull request #1647 from docker/1642-dockerclient-secretsJoffrey F2017-06-151-0/+1
|\ \ \ | | | | | | | | DockerClient.secrets should be a @property
| * | | DockerClient.secrets should be a @property1642-dockerclient-secretsJoffrey F2017-06-141-0/+1
| |/ / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Move default `timeout` into `from_env`grahamlyons2017-06-092-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | We'd like to be able to pass `None` as a value for `timeout` because it has meaning to the `requests` library (http://docs.python-requests.org/en/master/user/advanced/#timeouts) Signed-off-by: grahamlyons <graham@grahamlyons.com>
* | | Ensure default timeout is used by API Clientgrahamlyons2017-06-081-3/+6
|/ / | | | | | | | | | | | | | | | | | | | | The `from_env` method on the `docker` module passed `None` as the value for the `timeout` keyword argument which overrode the default value in the initialiser, taken from `constants` module. This sets the default in the initialiser to `None` and adds logic to set that, in the same way that `version` is handled. Signed-off-by: grahamlyons <graham@grahamlyons.com>
* | Merge pull request #1619 from docker/AlexeyRokhin-masterJoffrey F2017-05-171-1/+1
|\ \ | | | | | | fix type checking for nano_cpus
| * | fix type checking for nano_cpusAlexeyRokhin-masterAlexey Rokhin2017-05-171-1/+1
| |/ | | | | | | Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
* | Merge pull request #1615 from docker/service-placementJoffrey F2017-05-173-32/+72
|\ \ | |/ |/| Add support for placement preferences and platforms in TaskTemplate
| * Add support for placement preferences and platforms in TaskTemplateservice-placementJoffrey F2017-05-173-32/+72
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1612 from lawliet89/build-stageJoffrey F2017-05-172-1/+13
|\ \ | |/ |/| Add `target` argument to image building
| * Add `target` argument to image buildingYong Wen Chua2017-05-162-1/+13
| | | | | | | | | | | | | | | | | | | | 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>
* | dev versionJoffrey F2017-05-161-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Bump 2.3.02.3.0-releaseJoffrey F2017-05-161-1/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* 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-123-10/+19
| | | | | | | | network equivalent. Small docfixes Signed-off-by: Joffrey F <joffrey@docker.com>
* init_path removed in Engine 17.05init_path_removedJoffrey F2017-05-091-0/+4
| | | | 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>
* Merge branch 'issue1567' of https://github.com/Niboo/docker-py into ↵Joffrey F2017-05-081-3/+6
|\ | | | | | | | | | | Niboo-issue1567 Signed-off-by: Joffrey F <joffrey@docker.com>
| * Fix the way the list of mounts is made for service.Antoine Verlant2017-05-081-3/+6
| | | | | | | | Signed-off-by: Antoine Verlant <antoine@niboo.be>
* | Merge branch 'aaronthebaron-1577-multi-success-message'Joffrey F2017-05-051-12/+15
|\ \
| * | 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>
* | | | Update image create error parsingAlfred Landrum2017-05-041-1/+2
|/ / / | | | | | | | | | | | | | | | | | | Support new error message returned for image creation in: https://github.com/moby/moby/pull/33005 Signed-off-by: Alfred Landrum <alfred@leakybucket.org>
* | | Modernize exec_api.pyJoffrey F2017-05-021-5/+5
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge branch 'add-env-support-to-exec' of ↵Joffrey F2017-05-022-4/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | 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-292-4/+19
| | | | | | | | | | | | | | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | | Merge pull request #1583 from delcypher/cpuset_fixesJoffrey F2017-05-023-2/+18
|\ \ \ \ | | | | | | | | | | CPUset* parameter fixes
| * | | | Fix typo s/CpuSetCpus/CpusetCpus/Dan Liew2017-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to Docker's API documentation [1]. The parameter name is `CpusetCpus` not `CpuSetCpus`. [1] https://docs.docker.com/engine/api/v1.25/#operation/ContainerCreate Signed-off-by: Dan Liew <daniel.liew@imperial.ac.uk>
| * | | | Add missing support for `CpusetMems` parameter to HostConfig.Dan Liew2017-05-013-1/+17
| | |/ / | |/| | | | | | | | | | Signed-off-by: Dan Liew <daniel.liew@imperial.ac.uk>
* | | | Merge pull request #1586 from terminalmage/refresh_credentialsJoffrey F2017-05-021-0/+14
|\ \ \ \ | | | | | | | | | | Add function to refresh credentials from config.json
| * | | | Move reload_config func into the APIClientErik Johnson2017-05-022-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also revert an incorrect change in the DaemonApiMixin's login func Signed-off-by: Erik Johnson <palehose@gmail.com>
| * | | | Add a reload_config function to the DaemonApiMixinErik Johnson2017-05-021-2/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This allows the client to reload the config.json for an existing APIClient instance. Signed-off-by: Erik Johnson <palehose@gmail.com>
* | | | Documentation fixes for login funcErik Johnson2017-05-021-4/+5
|/ / / | | | | | | | | | | | | | | | | | | This makes a small tweak to the grammar of the documentation for the reauth argument, and also updates the dockercfg_path docs for accuracy. Signed-off-by: Erik Johnson <palehose@gmail.com>
* | | Merge pull request #1570 from AlexeyRokhin/masterJoffrey F2017-04-282-1/+33
|\ \ \ | |/ / |/| | 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-282-10/+11
| | | | | | | | | | | | | | | | | | 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-192-1/+32
| |/ | | | | | | 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>
View Lorry Controller Status