| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update changelog for 1.7.11.7.1-release | Joffrey F | 2016-02-17 | 1 | -0/+20 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Bumped version to 1.7.1 | Joffrey F | 2016-02-17 | 1 | -1/+1 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #928 from docker/926-ignored_dockerfiles | Joffrey F | 2016-02-09 | 2 | -6/+24 |
| |\ | | | | | Never exclude Dockerfile from the build context. | ||||
| | * | Never exclude Dockerfile from the build context.926-ignored_dockerfiles | Joffrey F | 2016-02-09 | 2 | -6/+24 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #929 from docker/927-config-parsing | Joffrey F | 2016-02-09 | 2 | -4/+48 |
| |\ \ | |/ |/| | Don't break when parsing unknown config keys | ||||
| | * | Don't break when parsing unknown config keys927-config-parsing | Joffrey F | 2016-02-09 | 2 | -4/+48 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge branch 'keloyang-VolumeBind' | Joffrey F | 2016-02-08 | 1 | -2/+0 |
| |\ | |||||
| | * | Merge branch 'VolumeBind' of https://github.com/keloyang/docker-py into ↵ | Joffrey F | 2016-02-08 | 1 | -2/+0 |
| | |\ |/ / | | | | | keloyang-VolumeBind | ||||
| | * | create tempfile in VolumeBindTest for non-auto-creating of docker | yangshukui | 2016-02-04 | 1 | -0/+1 |
| | | | | | | | | | Signed-off-by: yangshukui <yangshukui@huawei.com> | ||||
| * | | Merge pull request #920 from docker/ssl_version_simpler | Joffrey F | 2016-02-05 | 3 | -17/+18 |
| |\ \ | | | | | | | Remove obsolete SSL version computation | ||||
| | * | | Remove obsolete SSL version computationssl_version_simpler | Joffrey F | 2016-02-03 | 3 | -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-false | Joffrey F | 2016-02-04 | 3 | -33/+91 |
| |\ \ | | | | | | | Re-write kwargs_from_env to handle TLS options better | ||||
| | * | | Re-write kwargs_from_env to handle TLS options better | Mike Dougherty | 2016-02-04 | 3 | -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/master | Joffrey F | 2016-02-04 | 3 | -1/+17 |
| |\ \ | | | | | | | Add support for shm_size. | ||||
| | * | | Add support for shm_size. | Spencer Rinehart | 2016-02-04 | 3 | -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 version | Joffrey F | 2016-02-04 | 1 | -1/+1 |
| |/ / | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #922 from docker/release-1.7.01.7.0 | Joffrey F | 2016-02-04 | 2 | -1/+34 |
| |\ \ | |/ |/| | Release 1.7.0 | ||||
| | * | Bump to stable versionrelease-1.7.0 | Joffrey F | 2016-02-04 | 2 | -1/+34 |
| |/ | | | | | | Update ChangeLog Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #915 from docker/914_hostconfig_start | Joffrey F | 2016-02-01 | 1 | -1/+1 |
| |\ | | | | | Update outdated error message | ||||
| | * | Update outdated error message914_hostconfig_start | Joffrey F | 2016-01-29 | 1 | -1/+1 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #912 from docker/495_port_bindings_advanced_doc | Aanand Prasad | 2016-01-29 | 1 | -0/+17 |
| |\ | | | | | Advanced documentation for port bindings | ||||
| | * | Advanced documentation for port bindings495_port_bindings_advanced_doc | Joffrey F | 2016-01-28 | 1 | -0/+17 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #911 from docker/894-docker_host_env | Daniel Nephin | 2016-01-29 | 3 | -6/+11 |
| |\ \ | |/ |/| | Support unspecified protocol in base_url when using TLS | ||||
| | * | Support unspecified protocol in base_url when using TLS894-docker_host_env | Joffrey F | 2016-01-28 | 3 | -6/+11 |
| |/ | | | | | | (assume HTTPS) Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Bump RC1.7.0-rc3 | Joffrey F | 2016-01-26 | 1 | -1/+1 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #906 from aanand/capture-stdout-stderr | Joffrey F | 2016-01-25 | 1 | -1/+1 |
| |\ | | | | | Re-enable stdout/stderr capturing in tests | ||||
| | * | Re-enable stdout/stderr capturing in tests | Aanand Prasad | 2016-01-25 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | ||||
| * | | Merge pull request #907 from aanand/raise-for-status-connect-disconnect | Joffrey F | 2016-01-25 | 2 | -2/+10 |
| |\ \ | |/ |/| | Raise exceptions for API errors on network connect/disconnect | ||||
| | * | Raise exceptions for API errors on network connect/disconnect | Aanand Prasad | 2016-01-25 | 2 | -2/+10 |
| |/ | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | ||||
| * | Bumped RC1.7.0rc2 | Joffrey F | 2016-01-21 | 1 | -1/+1 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #902 from docker/py32_deprecation | Aanand Prasad | 2016-01-21 | 3 | -3/+1 |
| |\ | | | | | Drop support for python 3.2 | ||||
| | * | Drop support for python 3.2py32_deprecation | Joffrey F | 2016-01-20 | 3 | -3/+1 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #901 from aanand/networking-links | Joffrey F | 2016-01-20 | 6 | -10/+85 |
| |\ | | | | | Support links (container-local aliases) when creating containers or connecting to networks | ||||
| | * | Support links when creating containers or connecting to networks | Aanand Prasad | 2016-01-20 | 6 | -10/+85 |
| |/ | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | ||||
| * | 1.7.0 release candidate1.7.0-rc1rc_1.7.0 | Joffrey F | 2016-01-18 | 1 | -1/+1 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #880 from docker/813-parse-float-bytes | Joffrey F | 2016-01-18 | 2 | -16/+38 |
| |\ | | | | | Handle 64-bit integer values in parse_bytes | ||||
| | * | parse_bytes: Add ability to handle 64-bit integers in py2 | Joffrey F | 2016-01-18 | 2 | -16/+38 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #899 from docker/http-headers-support | Joffrey F | 2016-01-18 | 5 | -5/+49 |
| |\ \ | |/ |/| | Add HttpHeaders support | ||||
| | * | Add HttpHeaders support in load_config | Pavel Kravchenko | 2016-01-18 | 5 | -5/+49 |
| |/ | | | | Signed-off-by: Pavel Kravchenko <kpavel@il.ibm.com> | ||||
| * | Merge pull request #889 from docker/725-devices-format | Aanand Prasad | 2016-01-18 | 5 | -20/+94 |
| |\ | | | | | Improve host devices support | ||||
| | * | Improve host devices support | Joffrey F | 2016-01-18 | 5 | -20/+94 |
| |/ | | | | | | | | Add unit tests for utils.parse_devices Rewrite documentation Support dict and string format for device declaration Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #898 from docker/https_docs_link | Joffrey F | 2016-01-18 | 2 | -3/+3 |
| |\ | | | | | Update HTTPS docs link | ||||
| | * | Update HTTPS docs linkhttps_docs_link | Joffrey F | 2016-01-18 | 2 | -3/+3 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #897 from aanand/network-options | Aanand Prasad | 2016-01-18 | 5 | -27/+68 |
| |\ \ | |/ |/| | Normalise/fix networking API JSON keys | ||||
| | * | Normalise/fix networking API JSON keys | Aanand Prasad | 2016-01-18 | 5 | -27/+68 |
| |/ | | | | | | | - Use CamelCase - `auxaddresses` -> `AuxiliaryAddresses` Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | ||||
| * | Merge pull request #895 from aanand/alias | Aanand Prasad | 2016-01-14 | 8 | -10/+136 |
| |\ | | | | | Implement support for network-scoped aliases | ||||
| | * | Implement support for network-scoped aliases | Aanand Prasad | 2016-01-14 | 8 | -10/+136 |
| |/ | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | ||||
| * | Merge pull request #892 from docker/base_url_none | Daniel Nephin | 2016-01-11 | 1 | -1/+1 |
| |\ | | | | | Don't break if base_url == None and TLS is enabled | ||||
| | * | Don't break if base_url == None and TLS is enabledbase_url_none | Joffrey F | 2016-01-08 | 1 | -1/+1 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #818 from rmb938/patch-1 | Aanand Prasad | 2016-01-05 | 7 | -4/+83 |
| |\ | | | | | allow custom ipam options when creating networks | ||||
 |
index : delta/docker-py.git | |
| github.com: dotcloud/docker-py.git |
| summaryrefslogtreecommitdiff |