Commit Graph

2028 Commits

Author SHA1 Message Date
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
realityone 2ba802dfbe
provide best practice for Image.save
Signed-off-by: realityone <realityone@me.com>
2017-01-06 11:44:58 +08:00
Joffrey F 6d871990d2 Merge pull request #1362 from qazbnm456/add_filters_to_networks
Add filters option to NetworkApiMixin.networks
2017-01-05 11:44:13 -08:00
Lobsiinvok 9047263354 Add filters option to NetworkApiMixin.networks
Signed-off-by: Boik <qazbnm456@gmail.com>
2017-01-05 09:23:26 +08:00
Dmitri 59ccd8a782 Fix readonly in mounts.
Signed-off-by: Dmitri Zimine dz@stackstorm.com
2016-12-28 23:43:15 -08:00
Joffrey F edd3045ef1 Merge pull request #1350 from docker/changelog-update
Changelog update
2016-12-12 16:55:04 -08:00
Joffrey F 4219ebc9a1 Bump version number to next dev
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-12 14:30:21 -08:00
Joffrey F f008f34424 Remove development version warning from README
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-12 14:29:33 -08:00
Joffrey F 7b8809eb07 Bump version and update Changelog
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-12 14:29:13 -08:00
Joffrey F 95413dd176 Merge pull request #1332 from docker/docker_sdk_rename
Rename all meaningful occurrences of docker-py to docker-sdk-python
2016-12-12 13:53:27 -08:00
Joffrey F 769ca5a76a Rename non-URL occurrences of docker-py to "Docker SDK for Python"
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-12 13:28:49 -08:00
Joffrey F c6d1c2dc84 Merge pull request #1342 from docker/jenkinsfile
Add Jenkinsfile for integration tests matrix
2016-12-08 16:42:38 -08:00
Joffrey F 48c5cd82fc Prevent Swarm address conflicts
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-08 14:50:05 -08:00
Joffrey F 3fb48d111b Add Jenkinsfile for integration tests matrix
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-08 12:12:01 -08:00
Flavio Curella 6f239fbf29 Make resources hashable, so that they can be added to `set`s
Signed-off-by: Flavio Curella <flavio.curella@gmail.com>
2016-12-08 12:19:30 -06:00
徐俊杰 b9c48dca2c Scope is added in volume after docker 1.12
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>
2016-12-08 10:31:44 +08:00
Joffrey F d024b1bd78 Merge pull request #1338 from docker/remove_node
Implement swarm node removal
2016-12-07 15:37:17 -08:00
Joffrey F 281b5558b5 Merge pull request #1340 from docker/dnephin-add-attachable
Add attachable option in create_network
2016-12-07 15:36:43 -08:00
Joffrey F 738cfdcdf9 Update code and tests for Engine 1.13 compatibility
Makefile now runs tests against Docker 1.13 RC

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-07 14:51:14 -08:00
Joffrey F c239e40504 Implement swarm node removal
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-07 12:24:18 -08:00
Pavel Sviderski 2b88e9cddb increase logs performance, do not copy bytes object
Signed-off-by: Pavel Sviderski <pavel@psviderski.name>
2016-12-07 18:12:12 +08:00
Joffrey F b71f34e948 Fix typo in create_network
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-06 11:26:53 -08:00
Ryan Belgrave 16d0f96bc5
Name is not required when creating a docker volume
Signed-off-by: Ryan Belgrave <Ryan.Belgrave@target.com>
2016-12-06 10:46:02 -06:00
Ben Firshman 9050e1c6e0 Merge pull request #1339 from docker/min_version_1.21
Minimum version 1.24 -> 1.21
2016-12-06 15:50:20 +01:00
Joffrey F 993001bc49 Minimum version 1.24 -> 1.21
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-05 16:53:21 -08:00
Daniel Nephin 2b85fbf120 Add attachable.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2016-12-05 17:54:18 -05:00
Ben Firshman dd8ad21c88 Merge pull request #1272 from TomasTomecek/1271-fix-detach-in-exec-start
exec: fix running with detach=True
2016-12-05 11:00:10 +00:00
Joffrey F c02493cf18 Merge pull request #1331 from aanand/fix-auth-config-path-windows
Fix auth config path on Windows
2016-12-02 18:07:08 -08:00
Joffrey F d56b2d3dc8 Merge pull request #1315 from bfirsh/rename-docker-py-to-docker-sdk-python
Start to rename docker-py to docker-sdk-python
2016-12-02 15:20:34 -08:00
Joffrey F 32cd0161b6 Merge pull request #1330 from docker/walkerlee-master
Add options to IPAMConfig
2016-12-02 15:18:41 -08:00
Joffrey F fbc9f9b5e9 Merge pull request #1327 from docker/compose4171_build_auth_headers
Properly fill out auth headers in APIClient.build when using a credstore
2016-12-02 15:08:48 -08:00
Joffrey F 3fe014475c Merge pull request #1329 from docker/manics-patch-1
Use format_environment to convert env in ContainerSpec
2016-12-02 15:08:27 -08:00