summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Invalid log driver error raised during create_container stepdocker-21153Joffrey F2016-03-141-6/+5
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'mdaue-935'Joffrey F2016-03-092-0/+66
|\
| * Merge branch '935' of https://github.com/mdaue/docker-py into mdaue-935Joffrey F2016-03-092-0/+66
| |\ |/ /
| * Add ip4&ip6 (#935) support, network/id/connectMatt Daue2016-03-022-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matt Daue <mattdaue@gmail.com> - Implement check to validate API ver is >= 1.22 for new feature - Includes patch @elchris82: Changed network in data dict to IPAMConfig as needed from the API. See https://github.com/docker/docker/issues/20732 - Update unit test for container attach to net - Update integration tests - Add integration test for IP setting Signed-off-by: Matt Daue <mattdaue@gmail.com>
* | Merge pull request #977 from TomasTomecek/put-test-data-to-distJoffrey F2016-03-081-0/+1
|\ \ | | | | | | include unit test data in dist tarball
| * | include unit test data in dist tarballTomas Tomecek2016-03-081-0/+1
|/ / | | | | | | | | | | Fixes #976 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | Merge pull request #971 from docker/963-tlsv1-defaultJoffrey F2016-03-031-1/+6
|\ \ | |/ |/| Use protocol TLS v1.0 by default when none is set.
| * Use protocol TLS v1.0 by default when none is set.963-tlsv1-defaultJoffrey F2016-03-021-1/+6
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #970 from marshyski/masterAanand Prasad2016-03-021-1/+1
|\ | | | | Updated stat networks print output
| * Updated stat networks print output Signed-off-by: Tim Marcinowski ↵Tim Ski2016-03-021-1/+1
|/ | | | <marshyski@gmail.com>
* Merge pull request #968 from atopuzov/decode_on_push_and_pullJoffrey F2016-03-011-4/+4
|\ | | | | Use decode on push and pull operations.
| * Use decode on push and pull operations.Aleksandar Topuzovic2016-03-011-4/+4
|/ | | | | | | Stream helper has the ability to decode the responses from strings to JSON. This commit enables this functionality on push and pull operations. Signed-off-by: Aleksandar Topuzovic <aleksandar.topuzovic@gmail.com>
* Merge pull request #916 from docker/container_update_featureJoffrey F2016-02-246-40/+132
|\ | | | | Support for container limits update
| * Improve parse_bytes util methodcontainer_update_featureJoffrey F2016-02-232-40/+36
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * update_container now supports string valuesJoffrey F2016-02-231-4/+5
| | | | | | | | | | | | for mem_limit, memswap_limit, kernel_memory and mem_reservation Signed-off-by: Joffrey F <joffrey@docker.com>
| * Unit test for Client.update_container methodJoffrey F2016-02-232-0/+25
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Documentation for Client.update_container methodJoffrey F2016-02-231-1/+21
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * New `update_container` methodJoffrey F2016-02-232-0/+50
| | | | | | | | | | | | Allows user to update container limits in-flight. Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #942 from seguins/934-separate-stream-follow-logsJoffrey F2016-02-244-8/+56
|\ \ | | | | | | Separate params stream and follow for logs.
| * | Separate params stream and follow for logs.Stéphane Seguin2016-02-164-8/+56
| | | | | | | | | | | | | | | | | | Closes #934 Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
* | | Merge pull request #958 from dnephin/oops_fix_empty_env_vars_againDaniel Nephin2016-02-242-3/+6
|\ \ \ | | | | | | | | Fix env vars with empty values
| * | | Fix env vars with empty values.Daniel Nephin2016-02-242-3/+6
|/ / / | | | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | | Merge pull request #952 from dnephin/fix_empty_env_varsJoffrey F2016-02-242-4/+19
|\ \ \ | | | | | | | | Format environment variables to match docker-cli.
| * | | Format environment variables to match docker-cli.Daniel Nephin2016-02-232-4/+19
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | | | Merge pull request #954 from bfirsh/better-documentation-linkJoffrey F2016-02-241-4/+4
|\ \ \ \ | |_|_|/ |/| | | Readme improvements
| * | | Improved descriptionBen Firshman2016-02-241-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| * | | Improved documentation link copyBen Firshman2016-02-241-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | It's a little thing, but this made me hesitate before clicking the link because I thought I would be going to the Read the Docs home page, not the docker-py documentation. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | | Back to dev versionJoffrey F2016-02-231-1/+1
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #951 from docker/1.7.2-release1.7.2Joffrey F2016-02-232-1/+11
|\ \ | | | | | | Prepare 1.7.2 release
| * | Prepare 1.7.2 release1.7.2-releaseJoffrey F2016-02-232-1/+11
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #950 from aanand/fix-tlsJoffrey F2016-02-233-6/+9
|\ \ | | | | | | Fix TLS regressions
| * | Fix TLS regressionsAanand Prasad2016-02-233-6/+9
|/ / | | | | | | | | | | | | | | | | - Set `verify` to the CA cert path if one has been specified, rather than `True` - Don't set `assert_fingerprint` Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Back to dev versionJoffrey F2016-02-221-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #944 from docker/1.7.1-release1.7.1Joffrey F2016-02-222-1/+21
|\ \ | |/ |/| 1.7.1 release
| * Update changelog for 1.7.11.7.1-releaseJoffrey F2016-02-171-0/+20
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Bumped version to 1.7.1Joffrey F2016-02-171-1/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #928 from docker/926-ignored_dockerfilesJoffrey F2016-02-092-6/+24
|\ | | | | Never exclude Dockerfile from the build context.
| * Never exclude Dockerfile from the build context.926-ignored_dockerfilesJoffrey F2016-02-092-6/+24
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #929 from docker/927-config-parsingJoffrey F2016-02-092-4/+48
|\ \ | |/ |/| Don't break when parsing unknown config keys
| * Don't break when parsing unknown config keys927-config-parsingJoffrey F2016-02-092-4/+48
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge branch 'keloyang-VolumeBind'Joffrey F2016-02-081-2/+0
|\
| * Merge branch 'VolumeBind' of https://github.com/keloyang/docker-py into ↵Joffrey F2016-02-081-2/+0
| |\ |/ / | | | | keloyang-VolumeBind
| * create tempfile in VolumeBindTest for non-auto-creating of dockeryangshukui2016-02-041-0/+1
| | | | | | | | Signed-off-by: yangshukui <yangshukui@huawei.com>
* | Merge pull request #920 from docker/ssl_version_simplerJoffrey F2016-02-053-17/+18
|\ \ | | | | | | Remove obsolete SSL version computation
| * | Remove obsolete SSL version computationssl_version_simplerJoffrey F2016-02-033-17/+18
| |/ | | | | | | | | | | | | | | Recent versions of urllib3 (including the one packaged by requests) will automatically reject SSLv2/3. Additional test to check urllib3's behavior (mostly for release/packaging) Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #924 from mikedougherty/tls-verify-falseJoffrey F2016-02-043-33/+91
|\ \ | | | | | | Re-write kwargs_from_env to handle TLS options better
| * | Re-write kwargs_from_env to handle TLS options betterMike Dougherty2016-02-043-33/+91
|/ / | | | | | | | | | | | | | | This more closely matches the way the docker client interprets the relevant environment variables. Among other things, it's now possible to set DOCKER_TLS_VERIFY=false. Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
* | Merge pull request #923 from nubs/masterJoffrey F2016-02-043-1/+17
|\ \ | | | | | | Add support for shm_size.
| * | Add support for shm_size.Spencer Rinehart2016-02-043-1/+17
| | | | | | | | | | | | | | | | | | | | | --shm-size was added to Docker in 1.10 via docker/docker#16168. See docker/compose#2823 for more details. Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
* | | Back to dev versionJoffrey F2016-02-041-1/+1
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
View Lorry Controller Status