summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Bump default API version to 1.26Joffrey F2017-03-011-1/+1
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add init_path parameter to container HostConfigTomasz Madycki2017-03-011-0/+12
| | | | | | | | Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
* | Add init parameter to container HostConfigTomasz Madycki2017-03-011-0/+12
| | | | | | | | Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
* | Merge pull request #1479 from shin-/plugin-upgradeJoffrey F2017-03-011-0/+10
|\ \ | | | | | | Add upgrade_plugin method
| * | Add upgrade_plugin methodJoffrey F2017-02-231-0/+10
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Update assert in test_create_with_restart_policyBoaz Shuster2017-03-011-1/+1
|/ | | | | | | | | | | | In https://github.com/docker/docker/pull/30870 a new error message is displayed if the container is restarting. To make "test_create_with_restart_policy" pass against the above change, the test checks that the error message contains "You cannot remove " instead of "You cannot remove a running container" Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
* Merge pull request #1467 from crierr/masterJoffrey F2017-02-221-0/+5
|\ | | | | Allow port range like 8000-8010:80
| * Allow port range like 8000-8010:80crierr2017-02-201-0/+5
| | | | | | | | Signed-off-by: SeungJin Oh <crierr@naver.com>
* | Merge pull request #1473 from Anvil/event-http-headersJoffrey F2017-02-211-3/+6
|\ \ | | | | | | Allow events daemon command to read config.json
| * | Fixed events command related unit tests by passing a timeout valueDamien Nadé2017-02-211-3/+6
| |/ | | | | | | Signed-off-by: Damien Nadé <github@livna.org>
* | Add ability to set 'Hostname' on a Service.Nils Krabshuis2017-02-191-2/+3
|/ | | | Signed-off-by: Nils Krabshuis <nils.krabshuis@redwood.com>
* Merge pull request #1460 from shin-/fix-cache-fromJoffrey F2017-02-161-15/+29
|\ | | | | Rename cachefrom -> cache_from
| * Rename cachefrom -> cache_fromJoffrey F2017-02-151-15/+29
| | | | | | | | | | | | | | Fix cache_from integration test Fix image ID detection in ImageCollection.build Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add xfail mark to storageopt testJoffrey F2017-02-151-4/+5
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1459 from shin-/1300-storageoptsJoffrey F2017-02-152-0/+20
|\ | | | | Add support for storage_opt in host_config
| * Add support for storage_opt in host_configJoffrey F2017-02-152-0/+20
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1449 from shin-/secrets-apiJoffrey F2017-02-155-4/+150
|\ \ | | | | | | Implement secrets API
| * | Add tests for secret API implementationJoffrey F2017-02-135-4/+150
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Add support for recursive wildcard pattern in .dockerignoreJoffrey F2017-02-141-3/+13
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1432 from shin-/pluginsJoffrey F2017-02-134-0/+155
|\ \ | |/ | | Plugins API
| * Add create_plugin implementationJoffrey F2017-02-094-0/+41
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * APIClient implementation of plugin methodsJoffrey F2017-02-031-0/+114
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Fix passing volumes to run with no host pathBen Firshman2017-02-071-1/+11
| | | | | | | | | | | | | | | | | | Technically we shouldn't be passing them as binds, but the daemon doesn't seem to mind. Fixes #1380 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Fix volume path passed by run to create_containerBen Firshman2017-02-072-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | Seems like this is pretty much ignored by Docker, so it wasn't causing any visible issues, except when a volume name was used instead of a path. Also, added integration tests. Ref #1380 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Merge pull request #1425 from shin-/prunesJoffrey F2017-02-036-23/+81
|\ \ | | | | | | Prunes
| * | Add prune_networks methodJoffrey F2017-01-304-24/+44
| | | | | | | | | | | | | | | | | | Ensure all integration tests use the same version of the busybox image Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add prune_volumes methodJoffrey F2017-01-302-1/+9
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add prune_images methodJoffrey F2017-01-301-0/+16
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Add prune_containers methodJoffrey F2017-01-301-0/+14
| |/ | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1429 from shin-/fix_remove_network_testJoffrey F2017-01-301-4/+2
|\ \ | |/ |/| Improve robustness of remove_network integration test
| * Improve robustness of remove_network integration testJoffrey F2017-01-301-4/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1341 from pacoxu/patch-1Joffrey F2017-01-302-3/+16
|\ \ | | | | | | Scope is added in volume after docker 1.12
| * | Scope is added in volume after docker 1.12徐俊杰2016-12-082-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: pacoxu <paco.xu@daocloud.io> add ut test for volume scope and no specified name create Signed-off-by: Paco Xu <paco.xu@daocloud.io> try to fix ut failure of volume creation Signed-off-by: Paco Xu <paco.xu@daocloud.io> try to fix ut failure of volume creation Signed-off-by: Paco Xu <paco.xu@daocloud.io> Scope is added in volume after docker 1.12 Signed-off-by: pacoxu <paco.xu@daocloud.io> Scope is added in volume after docker 1.12 Signed-off-by: pacoxu <paco.xu@daocloud.io>
* | | Add support for force_update in TaskTemplateJoffrey F2017-01-273-7/+30
| | | | | | | | | | | | | | | | | | Add min version checks in create_service and update_service Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Add support for max_failure_ratio and monitor in UpdateConfigJoffrey F2017-01-271-0/+17
| |/ |/| | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Add stop_timeout to create_containerJoffrey F2017-01-273-3/+18
| | | | | | | | | | | | Fix requires_api_version test decorator Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1413 from docker/force_remove_volumeJoffrey F2017-01-261-0/+7
|\ \ | | | | | | Add 'force' parameter in remove_volume
| * | Add 'force' parameter in remove_volumeforce_remove_volumeJoffrey F2017-01-261-0/+7
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #1419 from docker/remove_obsolete_search_testJoffrey F2017-01-261-7/+0
|\ \ \ | | | | | | | | Remove integration test for APIClient.search method
| * | | Remove integration test for APIClient.search methodremove_obsolete_search_testJoffrey F2017-01-261-7/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | Merge pull request #1415 from docker/autoremove_supportJoffrey F2017-01-261-0/+12
|\ \ \ \ | | | | | | | | | | Add support for auto_remove in HostConfig
| * | | | Add support for auto_remove in HostConfigautoremove_supportJoffrey F2017-01-251-0/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | | | Implement cachefromThomas Schaaf2017-01-261-0/+18
| |/ / / |/| | | | | | | | | | | Signed-off-by: Thomas Schaaf <schaaf@komola.de>
* | | | Allow configuring API version for integration test with env varconfig_test_api_versionJoffrey F2017-01-2512-62/+73
|/ / / | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Fix Swarm model init to correctly pass arguments through to init_swarm1359-swarm-initJoffrey F2017-01-253-3/+4
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Ignore socket files in utils.tarJoffrey F2017-01-241-0/+15
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Convert mode argument to valid structure in create_service1388-format-service-modeJoffrey F2017-01-192-2/+59
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #1393 from aebm/masterJoffrey F2017-01-191-0/+5
|\ \ | | | | | | Fix #1351
| * | Fix #1351Alejandro E. Brito Monedero2017-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | * Fix TypeError when getting the tags property from an image that has no tags. Ex: An image pulled by cryptohash. It is handled like when the image doesn't have defined the RepoTags member. Signed-off-by: Alejandro E. Brito Monedero <alejandro.monedero@gmail.com>
* | | Merge pull request #1347 from fcurella/hashBen Firshman2017-01-181-0/+14
|\ \ \ | |/ / |/| | Make resources hashable, so that they can be added to `set`s