summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace erroneous networks argument in containers.run with singular1433-run-networksJoffrey F2017-05-125-13/+40
| | | | | | | | network equivalent. Small docfixes Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1599 from docker/test_17.05_engineJoffrey F2017-05-094-17/+37
|\ | | | | Adjust tests and add newest engine version to Jenkinsfile
| * Adjust tests and add newest engine version to Jenkinsfiletest_17.05_engineJoffrey F2017-05-094-17/+37
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1598 from docker/init_path_removedJoffrey F2017-05-092-0/+5
|\ | | | | init_path removed in Engine 17.05
| * init_path removed in Engine 17.05init_path_removedJoffrey F2017-05-092-0/+5
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1596 from docker/1585-pull-tagJoffrey F2017-05-094-9/+16
|\ | | | | Include tag in images.get after pulling if provided separately
| * Include tag in images.get after pulling if provided separately1585-pull-tagJoffrey F2017-05-094-9/+16
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'Niboo-issue1567'Joffrey F2017-05-082-5/+24
|\
| * Add ContainerSpec mounts testJoffrey F2017-05-081-2/+18
| | | | | | | | 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-052-12/+24
|\ \
| * | 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-052-12/+21
| |\ \ | | | | | | | | | | | | 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>
| | * | Add integration testsAaron Cowdin2017-05-021-0/+9
| | | | | | | | | | | | | | | | 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 pull request #1590 from alfred-landrum/denied-errorJoffrey F2017-05-051-1/+2
|\ \ \ \ | |/ / / |/| | | Update image create error parsing
| * | | 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>
* | | Merge branch 'TomasTomecek-add-env-support-to-exec'Joffrey F2017-05-024-9/+39
|\ \ \
| * | | Modernize exec_api.pyJoffrey F2017-05-022-7/+7
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | Merge branch 'add-env-support-to-exec' of ↵Joffrey F2017-05-024-5/+35
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | 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-294-5/+35
| | | | | | | | | | | | | | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | | Merge pull request #1583 from delcypher/cpuset_fixesJoffrey F2017-05-025-4/+47
|\ \ \ \ | | | | | | | | | | CPUset* parameter fixes
| * | | | Fix typo s/CpuSetCpus/CpusetCpus/Dan Liew2017-05-013-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-014-1/+44
| | |/ / | |/| | | | | | | | | | 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>
* | | | Merge pull request #1587 from terminalmage/docsJoffrey F2017-05-021-4/+5
|\ \ \ \ | |/ / / |/| | | Documentation fixes for login func
| * | | 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-284-1/+98
|\ \ \ | |/ / |/| | 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-284-20/+23
| | | | | | | | | | | | | | | | | | 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-194-1/+95
| |/ | | | | | | Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
* | Merge pull request #1493 from funkyfuture/model_propertiesJoffrey F2017-04-2710-18/+63
|\ \ | | | | | | Adds a few model properties
| * | Sorts model attributes in api docs alphabeticallyFrank Sachsenheim2017-04-152-9/+9
| | | | | | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
| * | Adds an 'image' property to the container modelFrank Sachsenheim2017-04-153-0/+16
| | | | | | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
| * | Adds a 'labels' property to the image modelFrank Sachsenheim2017-04-154-0/+15
| | | | | | | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
| * | Adds a 'labels' property to the container modelFrank Sachsenheim2017-04-154-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Makes docs builds faster and ensures proper ownershipFrank Sachsenheim2017-04-153-11/+11
| |/ | | | | | | Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
* | Merge pull request #1518 from smiller171/patch-1Joffrey F2017-04-271-0/+1
|\ \ | | | | | | Add License to PyPi metadata
| * | Add License to PyPi metadataScott Miller2017-03-171-0/+1
| | | | | | | | | | | | Signed-off-by: Scott Miller <scott@millergeek.xyz>
* | | Merge branch 'lyager-connect_argparse'Joffrey F2017-04-271-5/+8
|\ \ \
| * | | FormattingJoffrey F2017-04-271-8/+6
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | | Network model functions 'connect' and 'disconnect' did not accept or ↵Jesper L. Nielsen2017-04-271-4/+9
|/ / / | | | | | | | | | | | | | | | passthrough keyword arguments. Signed-off-by: Jesper L. Nielsen <lyager@gmail.com>
* | | Merge pull request #1574 from Coderhypo/masterJoffrey F2017-04-271-1/+1
|\ \ \ | | | | | | | | fix can't get a dict when Containers is None
| * | | fix can't get a dict when Containers is NonehhHypo2017-04-261-1/+1
| | |/ | |/| | | | | | | Signed-off-by: hhHypo <i@ihypo.net>
* | | Merge branch 'aashutoshrathi-restart_policy_typo'Joffrey F2017-04-271-2/+2
|\ \ \
| * | | Update services.pyAashutosh Rathi2017-04-271-2/+2
| |/ / | | | | | | | | | Signed-off-by: Aashutosh Rathi <aashutoshrathi@gmail.com>
* | | Merge pull request #1576 from robkooper/1572-replicas-0Joffrey F2017-04-272-1/+7
|\ \ \ | |/ / |/| | Fix if replicas is set to 0, Fixes #1572
View Lorry Controller Status