summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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>
| * | 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>
* | 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>
* | Fix if replicas is set to 0, Fixes #1572Rob Kooper2017-04-261-1/+1
|/ | | | Signed-off-by: Rob Kooper <kooper@illinois.edu>
* Standardize handling of verbose param in inspect_networkJoffrey F2017-04-101-11/+10
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add 'verbose' option for network inspect apiSanthosh Manohar2017-04-101-2/+11
| | | | Signed-off-by: Santhosh Manohar <santhosh@docker.com>
* 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>
* | Merge pull request #1554 from peter-slovak/fix-docs-container-cpu-optsJoffrey F2017-04-062-7/+5
|\ \ | | | | | | Fix docs container cpu opts
| * | 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-072-4/+4
| | | | | | | | | | | | Signed-off-by: Peter Slovak <peter.slovak@websupport.sk>
* | | Merge pull request #1547 from shin-/1543-volume-driver-movedJoffrey F2017-04-061-39/+52
|\ \ \ | |/ / |/| | Add support for volume_driver in HostConfig
| * | Add support for volume_driver in HostConfigJoffrey F2017-04-051-39/+52
| |/ | | | | | | | | | | Some cleanup in ContainerConfig + warning if volume_driver is provided (API>1.20) Signed-off-by: Joffrey F <joffrey@docker.com>
* | 2.3.0-devJoffrey F2017-04-051-1/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Update mentions of the default API version in docsJoffrey F2017-04-032-3/+3
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Fix test issuesappveyorJoffrey F2017-03-292-9/+10
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Set infinite timeout for the `events` methodJoffrey F2017-03-271-1/+2
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1524 from alex-dr/fix-apierror-statusJoffrey F2017-03-221-1/+1
|\ | | | | Fix APIError status_code property for client/server errors
| * Fix APIError status_code property for client/server errorsalex-dr2017-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | requests.Response objects evaluate as falsy when the status_code attribute is in the 400-500 range. Therefore we are assured that prior to this change, APIError would show `is_server_error() == False` when generated with a 500-level response and `is_client_error() == False` when generated with a 400-level response. This is not desirable. Added some seemingly dry (not DRY) unit tests to ensure nothing silly slips back in here. Signed-off-by: alex-dr <alex@datarobot.com>
* | Merge pull request #1446 from shin-/service-logsJoffrey F2017-03-212-0/+78
|\ \ | | | | | | Add service_logs command to APIClient and logs command to models.Service
| * | Add service_logs integration testJoffrey F2017-03-131-1/+2
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add service_logs command to APIClient and logs command to models.ServiceJoffrey F2017-03-132-0/+77
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Bump 2.2.0, update changelogJoffrey F2017-03-211-1/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1500 from shin-/fix_split_port_empty_stringJoffrey F2017-03-131-0/+2
|\ | | | | Raise an error when passing an empty string to split_port
| * Raise an error when passing an empty string to split_portJoffrey F2017-03-091-0/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1505 from AntaresS/documentation-fixJoffrey F2017-03-091-2/+2
|\ \ | |/ |/| documentation change
| * documentation changeAnda Xu2017-03-091-2/+2
| | | | | | | | Signed-off-by: Anda Xu <anda.xu@docker.com>
* | fix: Missing exception handling in split_port when no container portLei Gong2017-03-091-0/+5
|/ | | | | | | | | | "localhost:host_port:" case will raise TypeError exception directly Catch the "TypeError" and give proper error message * docker/utils/ports.py Signed-off-by: Lei Gong <xue177125184@gmail.com>
* Merge pull request #1481 from shin-/system_dfJoffrey F2017-03-062-0/+20
|\ | | | | Add df method
| * Add df methodJoffrey F2017-03-012-0/+20
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1480 from shin-/bump-default-api-versionJoffrey F2017-03-061-1/+1
|\ \ | | | | | | Bump default API version to 1.26
View Lorry Controller Status