Aleksandar Topuzovic
08629f3b8e
Use decode on push and pull operations.
...
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>
2016-03-01 11:54:14 +00:00
Joffrey F
81d8caaf36
Merge pull request #916 from docker/container_update_feature
...
Support for container limits update
2016-02-24 18:00:06 -08:00
Joffrey F
cdf6dc8c3c
Merge pull request #942 from seguins/934-separate-stream-follow-logs
...
Separate params stream and follow for logs.
2016-02-24 16:04:42 -08:00
Daniel Nephin
44555f323f
Merge pull request #958 from dnephin/oops_fix_empty_env_vars_again
...
Fix env vars with empty values
2016-02-24 15:55:58 -08:00
Daniel Nephin
3bad04649d
Fix env vars with empty values.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2016-02-24 15:36:21 -08:00
Joffrey F
507503cdfa
Merge pull request #952 from dnephin/fix_empty_env_vars
...
Format environment variables to match docker-cli.
2016-02-24 15:28:53 -08:00
Joffrey F
7214ab0864
Merge pull request #954 from bfirsh/better-documentation-link
...
Readme improvements
2016-02-24 11:52:36 -08:00
Ben Firshman
d86f8a0342
Improved description
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-02-24 14:05:08 +00:00
Ben Firshman
cdca7da3a2
Improved documentation link copy
...
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>
2016-02-24 13:57:09 +00:00
Daniel Nephin
d9d84ce8d1
Format environment variables to match docker-cli.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2016-02-23 16:30:26 -08:00
Joffrey F
7440603d98
Improve parse_bytes util method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 16:18:45 -08:00
Joffrey F
03279ff9a3
update_container now supports string values
...
for mem_limit, memswap_limit, kernel_memory and mem_reservation
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 16:18:36 -08:00
Joffrey F
a710fbf60a
Unit test for Client.update_container method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 16:18:36 -08:00
Joffrey F
6f6d0890a4
Documentation for Client.update_container method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 16:18:36 -08:00
Joffrey F
c3ba50c98d
New `update_container` method
...
Allows user to update container limits in-flight.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 16:18:36 -08:00
Joffrey F
aa651f80b1
Back to dev version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 16:17:10 -08:00
Joffrey F
cc399d22b4
Merge pull request #951 from docker/1.7.2-release
...
Prepare 1.7.2 release
2016-02-23 15:07:37 -08:00
Joffrey F
287ab93399
Prepare 1.7.2 release
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 15:02:11 -08:00
Joffrey F
7070346516
Merge pull request #950 from aanand/fix-tls
...
Fix TLS regressions
2016-02-23 15:01:32 -08:00
Aanand Prasad
9ba0ddf267
Fix TLS regressions
...
- 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>
2016-02-23 14:29:52 -08:00
Joffrey F
cc450d697c
Back to dev version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-22 18:05:05 -08:00
Joffrey F
ffe524151f
Merge pull request #944 from docker/1.7.1-release
...
1.7.1 release
2016-02-22 12:42:24 -08:00
Joffrey F
498c7d4837
Update changelog for 1.7.1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-17 11:00:19 -08:00
Joffrey F
19564e34be
Bumped version to 1.7.1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-17 11:00:13 -08:00
Stéphane Seguin
71fafd3209
Separate params stream and follow for logs.
...
Closes #934
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-02-16 18:51:55 +01:00
Joffrey F
c3a66cc599
Merge pull request #928 from docker/926-ignored_dockerfiles
...
Never exclude Dockerfile from the build context.
2016-02-09 12:52:04 -08:00
Joffrey F
f368f072f5
Merge pull request #929 from docker/927-config-parsing
...
Don't break when parsing unknown config keys
2016-02-09 12:15:25 -08:00
Joffrey F
90760cfe1d
Never exclude Dockerfile from the build context.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-09 12:11:30 -08:00
Joffrey F
dc198be26c
Don't break when parsing unknown config keys
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-09 12:08:34 -08:00
Joffrey F
575305fdba
Merge branch 'keloyang-VolumeBind'
2016-02-08 11:37:31 -08:00
Joffrey F
fea32eb983
Merge branch 'VolumeBind' of https://github.com/keloyang/docker-py into keloyang-VolumeBind
2016-02-08 11:36:09 -08:00
Joffrey F
8bdaffc2e7
Merge pull request #920 from docker/ssl_version_simpler
...
Remove obsolete SSL version computation
2016-02-05 12:41:02 -08:00
Joffrey F
9d8663c5ab
Merge pull request #924 from mikedougherty/tls-verify-false
...
Re-write kwargs_from_env to handle TLS options better
2016-02-04 19:34:50 -08:00
Mike Dougherty
387db11009
Re-write kwargs_from_env to handle TLS options better
...
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>
2016-02-04 17:13:09 -08:00
Joffrey F
bba8e28f82
Merge pull request #923 from nubs/master
...
Add support for shm_size.
2016-02-04 14:28:09 -08:00
Joffrey F
084f758212
Back to dev version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-04 14:26:09 -08:00
Spencer Rinehart
fca622cad7
Add support for shm_size.
...
--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>
2016-02-04 12:33:05 -06:00
Joffrey F
60d814d742
Merge pull request #922 from docker/release-1.7.0
...
Release 1.7.0
2016-02-04 09:52:49 -08:00
Joffrey F
a11dc87bd3
Bump to stable version
...
Update ChangeLog
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-04 09:39:02 -08:00
yangshukui
f4b3a1bddd
create tempfile in VolumeBindTest for non-auto-creating of docker
...
Signed-off-by: yangshukui <yangshukui@huawei.com>
2016-02-04 15:49:15 +08:00
Joffrey F
b808cc45b4
Remove obsolete SSL version computation
...
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>
2016-02-03 17:50:52 -08:00
Joffrey F
a6a562a681
Merge pull request #915 from docker/914_hostconfig_start
...
Update outdated error message
2016-02-01 10:35:33 -08:00
Joffrey F
cf5755da45
Update outdated error message
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-29 17:26:10 -08:00
Aanand Prasad
818291ecbb
Merge pull request #912 from docker/495_port_bindings_advanced_doc
...
Advanced documentation for port bindings
2016-01-29 17:03:13 +00:00
Daniel Nephin
ebec62d5f8
Merge pull request #911 from docker/894-docker_host_env
...
Support unspecified protocol in base_url when using TLS
2016-01-29 10:20:45 -05:00
Joffrey F
41d049a11c
Advanced documentation for port bindings
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-28 17:55:36 -08:00
Joffrey F
bb94fe7a8c
Support unspecified protocol in base_url when using TLS
...
(assume HTTPS)
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-28 16:25:23 -08:00
Joffrey F
446e6d08dd
Bump RC
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-26 11:04:43 -08:00
Joffrey F
9b3b096709
Merge pull request #906 from aanand/capture-stdout-stderr
...
Re-enable stdout/stderr capturing in tests
2016-01-25 10:32:13 -08:00
Joffrey F
a909e2e5ee
Merge pull request #907 from aanand/raise-for-status-connect-disconnect
...
Raise exceptions for API errors on network connect/disconnect
2016-01-25 10:31:14 -08:00