| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Prevent issues when installing docker and docker-py in the same environment1395-docker-py-conflict | Joffrey F | 2017-01-18 | 1 | -0/+10 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Bump 2.0.1 | Joffrey F | 2017-01-09 | 1 | -0/+13 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1385 from docker/1376-parse-mount-type | Joffrey F | 2017-01-09 | 2 | -13/+48 |
| |\ | | | | | Detect mount type in parse_mount_string | ||||
| | * | Detect mount type in parse_mount_string1376-parse-mount-type | Joffrey F | 2017-01-09 | 2 | -13/+48 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1384 from docker/dzimine-dz-fix-mount_options | Joffrey F | 2017-01-09 | 3 | -9/+44 |
| |\ | | | | | Fix parse_mount_string | ||||
| | * | Raise InvalidArgument exception when invalid arguments are provideddzimine-dz-fix-mount_options | Joffrey F | 2017-01-09 | 2 | -6/+10 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Additional parse_mount_string tests | Joffrey F | 2017-01-09 | 2 | -18/+32 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Merge branch 'dz-fix-mount_options' of https://github.com/dzimine/docker-py ↵ | Joffrey F | 2017-01-09 | 2 | -1/+18 |
| | |\ |/ / | | | | | | | | | into dzimine-dz-fix-mount_options Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Fix readonly in mounts. | Dmitri | 2016-12-28 | 2 | -1/+18 |
| | | | | | | | Signed-off-by: Dmitri Zimine dz@stackstorm.com | ||||
| * | | Merge pull request #1379 from docker/compose-4302-dockerignore-windows | Joffrey F | 2017-01-09 | 2 | -9/+35 |
| |\ \ | | | | | | | Accept / as a path separator in dockerignore patterns on all platforms | ||||
| | * | | Accept / as a path separator in dockerignore patterns on all platformscompose-4302-dockerignore-windows | Joffrey F | 2017-01-06 | 2 | -9/+35 |
| |/ / | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1362 from qazbnm456/add_filters_to_networks | Joffrey F | 2017-01-05 | 1 | -7/+10 |
| |\ \ | |/ |/| | Add filters option to NetworkApiMixin.networks | ||||
| | * | Add filters option to NetworkApiMixin.networks | Lobsiinvok | 2017-01-05 | 1 | -7/+10 |
| |/ | | | | Signed-off-by: Boik <qazbnm456@gmail.com> | ||||
| * | Merge pull request #1350 from docker/changelog-update | Joffrey F | 2016-12-12 | 3 | -5/+120 |
| |\ | | | | | Changelog update | ||||
| | * | Bump version number to next devchangelog-update | Joffrey F | 2016-12-12 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Remove development version warning from README | Joffrey F | 2016-12-12 | 1 | -4/+0 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Bump version and update Changelog | Joffrey F | 2016-12-12 | 2 | -1/+120 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1332 from docker/docker_sdk_rename | Joffrey F | 2016-12-12 | 5 | -22/+24 |
| |\ | | | | | Rename all meaningful occurrences of docker-py to docker-sdk-python | ||||
| | * | Rename non-URL occurrences of docker-py to "Docker SDK for Python"docker_sdk_rename | Joffrey F | 2016-12-12 | 5 | -22/+24 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1342 from docker/jenkinsfile | Joffrey F | 2016-12-08 | 8 | -19/+121 |
| |\ | | | | | Add Jenkinsfile for integration tests matrix | ||||
| | * | Prevent Swarm address conflictsjenkinsfile | Joffrey F | 2016-12-08 | 8 | -28/+48 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Add Jenkinsfile for integration tests matrix | Joffrey F | 2016-12-08 | 1 | -0/+82 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1338 from docker/remove_node | Joffrey F | 2016-12-07 | 3 | -0/+64 |
| |\ | | | | | Implement swarm node removal | ||||
| | * | Implement swarm node removalremove_node | Joffrey F | 2016-12-07 | 3 | -0/+64 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1340 from docker/dnephin-add-attachable | Joffrey F | 2016-12-07 | 11 | -24/+75 |
| |\ \ | | | | | | | Add attachable option in create_network | ||||
| | * | | Update code and tests for Engine 1.13 compatibilitydnephin-add-attachable | Joffrey F | 2016-12-07 | 11 | -27/+53 |
| | | | | | | | | | | | | | | | | | | | Makefile now runs tests against Docker 1.13 RC Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | Fix typo in create_network | Joffrey F | 2016-12-06 | 2 | -4/+16 |
| | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | Add attachable. | Daniel Nephin | 2016-12-05 | 2 | -2/+15 |
| | | | | | | | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com> | ||||
| * | | | Merge pull request #1339 from docker/min_version_1.21 | Ben Firshman | 2016-12-06 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | Minimum version 1.24 -> 1.21 | ||||
| | * | | Minimum version 1.24 -> 1.21min_version_1.21 | Joffrey F | 2016-12-05 | 1 | -1/+1 |
| | |/ | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1272 from TomasTomecek/1271-fix-detach-in-exec-start | Ben Firshman | 2016-12-05 | 2 | -1/+17 |
| |\ \ | | | | | | | exec: fix running with detach=True | ||||
| | * | | exec: fix running with detach=True | Tomas Tomecek | 2016-11-29 | 2 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | Fixes #1271 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com> | ||||
| * | | | Merge pull request #1331 from aanand/fix-auth-config-path-windows | Joffrey F | 2016-12-02 | 2 | -12/+77 |
| |\ \ \ | |_|/ |/| | | Fix auth config path on Windows | ||||
| | * | | Fix auth config path on Windows | Aanand Prasad | 2016-12-02 | 2 | -12/+77 |
| | | | | | | | | | | | | | | | | | | | | | | The Engine client looks *only* at the USERPROFILE environment variable on Windows, so we should do that too. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | ||||
| * | | | Merge pull request #1315 from bfirsh/rename-docker-py-to-docker-sdk-python | Joffrey F | 2016-12-02 | 9 | -37/+37 |
| |\ \ \ | | | | | | | | | Start to rename docker-py to docker-sdk-python | ||||
| | * | | | Start to rename docker-py to docker-sdk-python | Ben Firshman | 2016-11-28 | 9 | -37/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pretty much everything except renaming the GitHub repo and documentation, which is not actually done yet. Nearer the release we can do a search/replace for all that stuff. Ref #1310 Signed-off-by: Ben Firshman <ben@firshman.co.uk> | ||||
| * | | | | Merge pull request #1330 from docker/walkerlee-master | Joffrey F | 2016-12-02 | 2 | -2/+9 |
| |\ \ \ \ | | | | | | | | | | | Add options to IPAMConfig | ||||
| | * | | | | Add options to IPAMConfigwalkerlee-master | Joffrey F | 2016-12-02 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | | | Merge branch 'master' of https://github.com/walkerlee/docker-py into ↵ | Joffrey F | 2016-12-02 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | walkerlee-master Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | | * | | | | Add docker network IPAM options parameter | Walker Lee | 2016-10-27 | 4 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Walker Lee <walkerlee.tw@gmail.com> | ||||
| * | | | | | | Merge pull request #1327 from docker/compose4171_build_auth_headers | Joffrey F | 2016-12-02 | 1 | -3/+19 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Properly fill out auth headers in APIClient.build when using a credstore | ||||
| | * | | | | | | Properly fill out auth headers in APIClient.build when usingcompose4171_build_auth_headers | Joffrey F | 2016-12-01 | 1 | -3/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a credentials store Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | | | | | Merge pull request #1329 from docker/manics-patch-1 | Joffrey F | 2016-12-02 | 3 | -2/+22 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Use format_environment to convert env in ContainerSpec | ||||
| | * | | | | | | Merge branch 'patch-1' of https://github.com/manics/docker-py into ↵manics-patch-1 | Joffrey F | 2016-12-02 | 3 | -2/+22 |
| | |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manics-patch-1 Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | | | | | Add test for creating service with env | Simon Li | 2016-11-11 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon Li <orpheus+devel@gmail.com> | ||||
| | * | | | | | | Use format_environment to convert env in ContainerSpec | Simon Li | 2016-11-11 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon Li <orpheus+devel@gmail.com> | ||||
| * | | | | | | | Merge pull request #1324 from docker/requests_2.12.2 | Joffrey F | 2016-12-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Exclude requests==2.12.2 from dependencies | ||||
| | * | | | | | | Exclude requests==2.12.2 from dependenciesrequests_2.12.2 | Joffrey F | 2016-11-30 | 1 | -1/+1 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | | | | Merge pull request #1328 from docker/ssladapter_transport_module | Ben Firshman | 2016-12-02 | 5 | -8/+8 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Move ssladapter to transport module | ||||
| | * | | | | | | Move ssladapter to transport modulessladapter_transport_module | Joffrey F | 2016-12-01 | 5 | -8/+8 |
| | | |_|/ / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
 |
index : delta/docker-py.git | |
| github.com: dotcloud/docker-py.git |
| summaryrefslogtreecommitdiff |