Commit Graph

2503 Commits

Author SHA1 Message Date
Joffrey F 370cdb6dc5 Merge branch 'issue1567' of https://github.com/Niboo/docker-py into Niboo-issue1567
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-08 14:02:13 -07:00
Antoine Verlant 933a303ede Fix the way the list of mounts is made for service.
Signed-off-by: Antoine Verlant <antoine@niboo.be>
2017-05-08 10:09:36 +02:00
Joffrey F a453aeff5a Merge branch 'aaronthebaron-1577-multi-success-message' 2017-05-05 15:11:24 -07:00
Joffrey F 431f7c6432 Improve build result detection
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-05 15:08:38 -07:00
Joffrey F e19aad860c Merge branch '1577-multi-success-message' of https://github.com/aaronthebaron/docker-py into aaronthebaron-1577-multi-success-message 2017-05-05 15:01:16 -07:00
Joffrey F 36b2d8149b Merge pull request #1590 from alfred-landrum/denied-error
Update image create error parsing
2017-05-05 11:36:52 -07:00
Alfred Landrum 02c5914d29
Update image create error parsing
Support new error message returned for image creation in:
https://github.com/moby/moby/pull/33005

Signed-off-by: Alfred Landrum <alfred@leakybucket.org>
2017-05-04 16:22:18 -07:00
Aaron Cowdin a164f4661b Better error handling, itterate on json stream directly.
Signed-off-by: Aaron Cowdin <aaron.cowdin@gmail.com>
2017-05-03 13:10:01 -07:00
Joffrey F 0a94e5a945 Merge branch 'TomasTomecek-add-env-support-to-exec' 2017-05-02 17:09:36 -07:00
Joffrey F c6030027f5 Modernize exec_api.py
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-02 17:09:09 -07:00
Aaron Cowdin 7dffc46234 Add integration tests
Signed-off-by: Aaron Cowdin <aaron.cowdin@gmail.com>
2017-05-02 17:01:34 -07:00
Joffrey F 13dfb13858 Merge branch 'add-env-support-to-exec' of https://github.com/TomasTomecek/docker-py into TomasTomecek-add-env-support-to-exec
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-02 16:38:40 -07:00
Joffrey F 67f12bd114 Merge pull request #1583 from delcypher/cpuset_fixes
CPUset* parameter fixes
2017-05-02 14:52:47 -07:00
Joffrey F 35b8c0a750 Merge pull request #1586 from terminalmage/refresh_credentials
Add function to refresh credentials from config.json
2017-05-02 14:46:22 -07:00
Erik Johnson 550c31e2b7 Move reload_config func into the APIClient
Also revert an incorrect change in the DaemonApiMixin's login func

Signed-off-by: Erik Johnson <palehose@gmail.com>
2017-05-02 16:26:35 -05:00
Joffrey F 0872f27def Merge pull request #1587 from terminalmage/docs
Documentation fixes for login func
2017-05-02 13:57:20 -07:00
Erik Johnson 0f843414e5 Add a reload_config function to the DaemonApiMixin
This allows the client to reload the config.json for an existing
APIClient instance.

Signed-off-by: Erik Johnson <palehose@gmail.com>
2017-05-02 15:10:44 -05:00
Erik Johnson 3a4fa79e1c Documentation fixes for login func
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>
2017-05-02 14:57:32 -05:00
Dan Liew 2a0a7adece Fix typo s/CpuSetCpus/CpusetCpus/
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>
2017-05-01 14:56:40 +01:00
Dan Liew b9ca8755bb Add missing support for `CpusetMems` parameter to HostConfig.
Signed-off-by: Dan Liew <daniel.liew@imperial.ac.uk>
2017-05-01 14:56:40 +01:00
Tomas Tomecek 4633dac580 exec: add support for `Env`
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2017-04-29 08:56:51 +02:00
Aaron Cowdin 59ba27068b Handle multiple success messages during image building.
Signed-off-by: Aaron Cowdin <aaron.cowdin@gmail.com>
2017-04-28 15:18:59 -07:00
Joffrey F 72b9b72359 Merge pull request #1570 from AlexeyRokhin/master
Add cpu_count, cpu_percent, nano_cpus parameters to container HostConfig.
2017-04-28 14:16:25 -07:00
Alexey Rokhin c2f83d558e cpus renamed to nano_cpus. Type and scale of nano_cpus are changed. Comments for new parameters are changed.
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-04-28 15:55:44 +03:00
Joffrey F d19572aae3 Merge pull request #1493 from funkyfuture/model_properties
Adds a few model properties
2017-04-27 16:21:02 -07:00
Joffrey F dec80d91c0 Merge pull request #1518 from smiller171/patch-1
Add License to PyPi metadata
2017-04-27 16:11:55 -07:00
Joffrey F d2ebc6ade4 Merge branch 'lyager-connect_argparse' 2017-04-27 15:47:35 -07:00
Joffrey F 16d32b40e6 Formatting
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-27 15:47:25 -07:00
Jesper L. Nielsen 9412e21f1a Network model functions 'connect' and 'disconnect' did not accept or passthrough keyword arguments.
Signed-off-by: Jesper L. Nielsen <lyager@gmail.com>
2017-04-27 15:47:25 -07:00
Joffrey F bd84bebfa9 Merge pull request #1574 from Coderhypo/master
fix can't get a dict when Containers is None
2017-04-27 15:43:45 -07:00
Joffrey F 55ef7acd26 Merge branch 'aashutoshrathi-restart_policy_typo' 2017-04-27 15:41:16 -07:00
Aashutosh Rathi c5cc23884a Update services.py
Signed-off-by: Aashutosh Rathi <aashutoshrathi@gmail.com>
2017-04-27 15:33:24 -07:00
Joffrey F 8ffa09b4b6 Merge pull request #1576 from robkooper/1572-replicas-0
Fix if replicas is set to 0, Fixes #1572
2017-04-27 15:30:36 -07:00
Rob Kooper 5f9a599b0f Fix if replicas is set to 0, Fixes #1572
Signed-off-by: Rob Kooper <kooper@illinois.edu>
2017-04-26 22:50:17 -05:00
hhHypo 2d026fd1e5 fix can't get a dict when Containers is None
Signed-off-by: hhHypo <i@ihypo.net>
2017-04-26 01:51:43 +08:00
Alexey Rokhin 3f7d622143 Add cpu_count, cpu_percent, cpus parameters to container HostConfig.
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-04-19 15:07:02 +03:00
Frank Sachsenheim 9536c8653d Sorts model attributes in api docs alphabetically
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2017-04-15 15:46:52 +02:00
Frank Sachsenheim 659090fc99 Adds an 'image' property to the container model
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2017-04-15 15:46:52 +02:00
Frank Sachsenheim b585ec59a8 Adds a 'labels' property to the image model
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2017-04-15 15:46:52 +02:00
Frank Sachsenheim 1cd56b9f0c Adds a 'labels' property to the container model
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>
2017-04-15 15:46:52 +02:00
Frank Sachsenheim 6529fa599c Makes docs builds faster and ensures proper ownership
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2017-04-15 15:46:52 +02:00
Joffrey F f127a9ffdc Merge pull request #1558 from shin-/sanimej-verbose
Add 'verbose' option for network inspect API
2017-04-11 16:25:14 -07:00
Joffrey F e506a2b8ea Standardize handling of verbose param in inspect_network
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-10 16:03:13 -07:00
Santhosh Manohar abd5370d87 Add 'verbose' option for network inspect api
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2017-04-10 16:03:13 -07:00
Joffrey F ffc3769920 Merge pull request #1557 from ewanbarr/patch-1
Minor typo correction
2017-04-10 12:14:33 -07:00
ewanbarr 112dc12bc0 Minor typo correction
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>
2017-04-08 14:20:45 +02:00
Joffrey F f8609c7462 Merge pull request #1554 from peter-slovak/fix-docs-container-cpu-opts
Fix docs container cpu opts
2017-04-06 16:18:14 -07:00
Joffrey F 19ef2ddccb Merge pull request #1547 from shin-/1543-volume-driver-moved
Add support for volume_driver in HostConfig
2017-04-06 16:11:23 -07:00
Peter Slovak c80762d376 removed duplicate mem_limit arg desc; type now consistent accross models (float->int)
Signed-off-by: Peter Slovak <peter.slovak@websupport.sk>
2017-04-07 00:38:14 +02:00
Peter Slovak 1f609208fd docs renames: cpu_group->cpu_period, cpu_period->cpu_quota
Signed-off-by: Peter Slovak <peter.slovak@websupport.sk>
2017-04-07 00:37:45 +02:00