docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,512 Commits 23 Branches 129 Tags 9.3 MiB
Commit Graph

1512 Commits

Author SHA1 Message Date
Joffrey F 8e93abf271 Merge branch 'master' into tls-fixes 2016-03-15 10:35:53 -07:00
Joffrey F fa7068cb7c Merge pull request #990 from docker/docker-21153 
Invalid log driver error raised during create_container step
 2016-03-14 17:20:57 -07:00
Joffrey F d4c17859a3 Invalid log driver error raised during create_container step 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-14 15:05:47 -07:00
Joffrey F ad480ff0b1 Fix enable_tls issue #984 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-11 12:27:24 -08:00
Joffrey F d8be3e0fce Merge branch 'mdaue-935' 2016-03-09 14:25:12 -08:00
Joffrey F b7b0fa6aff Merge branch '935' of https://github.com/mdaue/docker-py into mdaue-935 2016-03-09 14:24:54 -08:00
Joffrey F efc949a3df Merge pull request #977 from TomasTomecek/put-test-data-to-dist 
include unit test data in dist tarball
 2016-03-08 12:18:15 -08:00
Tomas Tomecek e6a81a1d05 include unit test data in dist tarball 
Fixes #976

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-03-08 13:33:17 +01:00
Joffrey F eb624e2c50 Merge pull request #971 from docker/963-tlsv1-default 
Use protocol TLS v1.0 by default when none is set.
 2016-03-03 12:11:58 -08:00
Vitaly Isaev 8dd9d1d66e Fix UnixHTTPConnectionPool's superclass initialization 
Signed-off-by: Vitaly Isaev <vitalyisaev2@gmail.com>
 2016-03-03 22:41:49 +03:00
Matt Daue d4a5bc4a86 Add ip4&ip6 (#935) support, network/id/connect 
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>
 2016-03-02 20:38:37 -05:00
Joffrey F f4114274d6 Use protocol TLS v1.0 by default when none is set. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-02 15:01:30 -08:00
Aanand Prasad 062c76d8b2 Merge pull request #970 from marshyski/master 
Updated stat networks print output
 2016-03-02 11:13:59 -08:00
Tim Ski d7af8d79a4 Updated stat networks print output Signed-off-by: Tim Marcinowski <marshyski@gmail.com> 2016-03-02 11:34:36 -05:00
Joffrey F 4e67d4d9bf Merge pull request #968 from atopuzov/decode_on_push_and_pull 
Use decode on push and pull operations.
 2016-03-01 11:17:04 -08:00
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