Commit Graph

1956 Commits

Author SHA1 Message Date
Joffrey F 08aac9d571 Merge pull request #1341 from pacoxu/patch-1
Scope is added in volume after docker 1.12
2017-01-30 11:59:00 -08:00
Joffrey F fd1ab6cef4 Merge pull request #1424 from shin-/service_params_1.25
Add new (1.25) service params
2017-01-30 11:51:29 -08:00
Joffrey F d22e2fec6f Add support for force_update in TaskTemplate
Add min version checks in create_service and update_service

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-27 17:19:18 -08:00
Joffrey F fc5cd1a914 Add support for max_failure_ratio and monitor in UpdateConfig
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-27 16:40:05 -08:00
Joffrey F d1b51c3967 Merge pull request #1421 from shin-/add_stop_timeout
Add stop_timeout to create_container
2017-01-27 16:39:32 -08:00
Joffrey F 847f209865 Add stop_timeout to create_container
Fix requires_api_version test decorator

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-27 16:00:18 -08:00
Joffrey F 0186456f3c Merge pull request #1413 from docker/force_remove_volume
Add 'force' parameter in remove_volume
2017-01-26 14:40:00 -08:00
Joffrey F 2d93674903 Merge pull request #1419 from docker/remove_obsolete_search_test
Remove integration test for APIClient.search method
2017-01-26 14:34:10 -08:00
Joffrey F a24b114af3 Add 'force' parameter in remove_volume
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-26 14:24:52 -08:00
Joffrey F 64519a2b20 Merge pull request #1415 from docker/autoremove_support
Add support for auto_remove in HostConfig
2017-01-26 14:24:23 -08:00
Joffrey F 432730ab29 Merge pull request #1417 from graingert/cachefrom
This adds the cache-from build option (docker/docker#26839) and fixes #1382.
2017-01-26 14:23:05 -08:00
Joffrey F 62c94f9634 Remove integration test for APIClient.search method
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-26 14:07:41 -08:00
Thomas Grainger 0d9adcdfdc
Add cachefrom to build docstring
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
2017-01-26 11:22:46 +00:00
Thomas Schaaf 686d8e9536
Implement cachefrom
Signed-off-by: Thomas Schaaf <schaaf@komola.de>
2017-01-26 11:20:01 +00:00
Joffrey F c031e54117 Merge pull request #1414 from docker/config_test_api_version
Allow configuring API version for integration test with env var
2017-01-25 18:43:20 -08:00
Joffrey F a1d550a14c Allow configuring API version for integration test with env var
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-25 16:52:26 -08:00
Joffrey F 848b7aa6a4 Add support for auto_remove in HostConfig
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-25 16:45:59 -08:00
Joffrey F 4ff77dc1c9 Merge pull request #1412 from docker/1359-swarm-init
Fix Swarm model init to correctly pass arguments through to init_swarm
2017-01-25 15:40:56 -08:00
Joffrey F 3e5bb7b0e6 Fix Swarm model init to correctly pass arguments through to init_swarm
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-25 15:28:43 -08:00
Joffrey F 39deace7c6 Merge pull request #1410 from bayazee/master
Remove duplicate line in exec_run documentation
2017-01-25 13:13:16 -08:00
Joffrey F ff83cf406d Merge pull request #1408 from docker/1407-tar-ignore-sockets
Ignore socket files in utils.tar
2017-01-25 12:37:46 -08:00
Joffrey F 93877241f9 Fix ImageNotFound detection
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-25 12:02:53 -08:00
Mehdi Bayazee df7e709fb6 Remove duplicate line in exec_run documentation
Signed-off-by: Mehdi Bayazee <bayazee@gmail.com>
2017-01-25 13:08:10 +01:00
Joffrey F e87ed38f69 Ignore socket files in utils.tar
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-24 18:00:42 -08:00
Joffrey F 8ca5b2b392 Fix milestone link
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-20 14:09:52 -08:00
Joffrey F 886e6ff9ea Bump 2.0.2
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-20 14:09:46 -08:00
Joffrey F c7412c5a30 Merge pull request #1403 from docker/update_test_engine_versions
Update dockerVersions
2017-01-20 14:02:45 -08:00
Joffrey F fbea15861e Update dockerVersions
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-19 18:05:11 -08:00
Joffrey F 32392b7df0 Merge pull request #1390 from docker/1388-format-service-mode
Convert mode argument to valid structure in create_service
2017-01-19 17:42:17 -08:00
Joffrey F 06e8081799 Convert mode argument to valid structure in create_service
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-19 16:23:32 -08:00
Joffrey F 5f0b469a09 Merge pull request #1398 from docker/docs-fixes
Fix a number of docs formatting issues
2017-01-19 16:19:57 -08:00
Joffrey F bcb869b27f Merge pull request #1399 from docker/1395-docker-py-conflict
Prevent issues when installing docker and docker-py in the same environment
2017-01-19 16:19:28 -08:00
Joffrey F bb665257ed Merge pull request #1393 from aebm/master
Fix #1351
2017-01-19 11:55:14 -08:00
Joffrey F e9691db91b Prevent issues when installing docker and docker-py in the same environment
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-18 16:26:22 -08:00
Joffrey F 7db5f7ebcc Merge pull request #1389 from docker/fix-stream-helper
Use json_stream function in decoded _stream_helper
2017-01-18 15:40:47 -08:00
Joffrey F 66d5733398 Fix a number of docs formatting issues
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-18 15:38:53 -08:00
Ben Firshman 468bb1c545 Merge pull request #1347 from fcurella/hash
Make resources hashable, so that they can be added to `set`s
2017-01-18 16:49:35 +01:00
Alejandro E. Brito Monedero 95b6fddd14 Fix #1351
* 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>
2017-01-16 08:48:41 +01:00
Joffrey F aed1af6f6f Merge pull request #1392 from graingert/case-pypi-correctly
case PyPI correctly
2017-01-13 17:00:48 -08:00
Thomas Grainger f0ceca4713
case PyPI correctly
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
2017-01-13 10:00:41 +00:00
Joffrey F fb6c9a8295 Use json_stream function in decoded _stream_helper
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-11 17:24:50 -08:00
Joffrey F 91a185d7a5 Bump 2.0.1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 15:57:29 -08:00
Joffrey F 56cfe0bf09 Merge pull request #1385 from docker/1376-parse-mount-type
Detect mount type in parse_mount_string
2017-01-09 15:25:03 -08:00
Joffrey F 40089a781c Detect mount type in parse_mount_string
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 15:13:09 -08:00
Joffrey F 07b20ce660 Merge pull request #1384 from docker/dzimine-dz-fix-mount_options
Fix parse_mount_string
2017-01-09 14:46:43 -08:00
Joffrey F 180dd69974 Raise InvalidArgument exception when invalid arguments are provided
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 14:34:25 -08:00
Joffrey F a960731999 Additional parse_mount_string tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 14:33:58 -08:00
Joffrey F 155b95d143 Merge branch 'dz-fix-mount_options' of https://github.com/dzimine/docker-py into dzimine-dz-fix-mount_options
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 14:19:25 -08:00
Joffrey F 4d982641c4 Merge pull request #1379 from docker/compose-4302-dockerignore-windows
Accept / as a path separator in dockerignore patterns on all platforms
2017-01-09 13:45:28 -08:00
Joffrey F 9450442c8c Accept / as a path separator in dockerignore patterns on all platforms
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-06 16:37:15 -08:00