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

843 Commits

Author SHA1 Message Date
Joffrey F 6f18b4a86f Mention version='auto' in docs 2015-03-05 12:12:02 -08:00
Joffrey F acfa99dd10 Auto-detect integration tests 2015-03-05 12:08:41 -08:00
Joffrey F bd46ba5757 Don't allow 'version' param in AutoVersionClient ctor 2015-03-05 12:08:16 -08:00
Joffrey F 2ec104792b Streamline exceptions for auto version ; retrieve_server_version into protected method 2015-03-05 11:52:47 -08:00
Tomas Tomecek 3e0496cc16 detect server version when version="auto" 
heavily inspired by PR#281

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2015-03-05 08:53:29 +01:00
Joffrey F 9bed480c27 Bump requests version 2015-03-04 16:29:44 -08:00
Joffrey F 55571308e8 Merge branch 'master' of github.com:docker/docker-py 2015-03-04 13:38:05 -08:00
Joffrey F a043173676 Merge branch 'ssanderson-py3-json' 2015-03-04 13:37:50 -08:00
Joffrey F dc210b865e Only call decode if Python 3.x 2015-03-04 13:37:34 -08:00
Joffrey F 7e600a3fe7 Merge branch 'py3-json' of https://github.com/ssanderson/docker-py into ssanderson-py3-json 2015-03-04 13:35:35 -08:00
Joffrey F 1aee1df4dd Merge pull request #511 from rmohr/fix-open-files 
Properly close files and sockets in unit tests
 2015-03-04 13:34:20 -08:00
Joffrey F 134e4b712c Merge pull request #514 from dlorenc/master 
Handle passwords with ':' characters.
 2015-03-03 15:19:48 -08:00
dlorenc c4cb509277 Handle passwords with ':' characters. 
Signed-off-by: dlorenc <lorenc.d@gmail.com>
 2015-03-03 14:51:35 -08:00
Roman Mohr a86bfffd89 Properly close files and sockets in unit tests 2015-02-28 21:03:15 +01:00
Joffrey F 39ee5981b4 Merge pull request #502 from cpuguy83/498_dockerignore_special_names 
Add special cases for .dockerignore
 2015-02-27 11:56:19 -08:00
Joffrey F 91985b2397 Merge pull request #509 from docker/lxc_driver_test_compat 
Lxc driver test compat
 2015-02-27 11:48:36 -08:00
Joffrey F 0fae821350 Merge pull request #508 from docker/de-i11003 
Rename test fix to take into account docker/docker#11003
 2015-02-27 11:47:57 -08:00
Joffrey F a341aa2d26 Merge branch 'aanand-fix-resolve-authconfig' 2015-02-27 11:45:21 -08:00
Joffrey F 86390888d8 shorter convert_to_hostname 2015-02-27 11:44:53 -08:00
Aanand Prasad b1a858a14d Update resolve_authconfig to bring it in line with Docker client 
Instead of expanding the registry name we're looking for to a full URL,
strip entries in the authconfig down to just the hostname.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-27 13:10:20 +00:00
Joffrey F 8d2b71fa7e I suck at python 2015-02-26 17:54:19 -08:00
Joffrey F e255c10f57 Ensure integration tests work with LXC exec driver 2015-02-26 17:39:44 -08:00
Joffrey F 21cc9916fd Rename test fix to take into account docker/docker#11003 2015-02-26 17:16:36 -08:00
Brian Goff ce40730b42 Add special cases for .dockerignore 
Fixes #498
Allowing `Dockerfile` and `.dockerignore` in the exclusion filter
completely breaks the build on docker < 1.5

In Docker 1.5 these entries are treated as special cases when included
in the .dockerignore and are still sent as part of the context. The
daemon ends up excluding them from any `ADD`, `COPY`, and cache
validation.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-02-24 15:48:51 -05:00
Scott Sanderson bf97ebb2ed BUG: Fix errors in Python 3 from JSON-decoding bytes. 2015-02-24 11:23:00 -05:00
Joffrey F 5ce02b9f14 Merge pull request #500 from dnephin/support_build_dockerfile 
Add support for dockerfile
 2015-02-23 10:14:49 -08:00
Daniel Nephin 0713488fac Resolves #497 - add support for dockerfile 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-02-20 21:20:21 -05:00
Joffrey F d39da11679 Merge pull request #494 from tianon/fix-host-assumptions 
Fix several DOCKER_HOST assumptions in integration_test.py
 2015-02-16 18:40:29 -08:00
Joffrey F 5dace1114d Back to dev version 2015-02-16 18:38:29 -08:00
Tianon Gravi 7f49cf1279 Fix several DOCKER_HOST assumptions in integration_test.py 2015-02-16 16:42:34 -07:00
Joffrey F 7084802da2 Fix pep8 error 2015-02-16 10:56:08 -08:00
Joffrey F 35b694d678 Merge pull request #493 from docker/1.0.0-release 
1.0.0 release
 2015-02-16 10:53:06 -08:00
Joffrey F 0f1bd817ac 1.0.0 changelog 2015-02-12 16:14:30 -08:00
Joffrey F 2c60e67ddc Bumped version to 1.0.0 2015-02-12 16:14:17 -08:00
Joffrey F c02f0ab723 Formatting 2015-02-12 15:54:16 -08:00
Joffrey F 21bcf7723f Added api_version property 2015-02-12 15:36:50 -08:00
Joffrey F 81056e7c5f Remove unused code 2015-02-12 15:31:30 -08:00
Joffrey F ec642f3710 Merge pull request #492 from ggtools/json-stats 
Add decode parameter to be able to the the stats as a dictionary
 2015-02-12 13:36:27 -08:00
Christophe Labouisse 26e74c8cc4 Add decode parameter to be able to the the stats as a dictionary 2015-02-12 22:27:02 +01:00
Joffrey F 21e189c923 Merge branch 'nir0s-add-stats-api-support' 2015-02-12 13:17:04 -08:00
Joffrey F 1f1e399958 Don't modify changelog yet 2015-02-12 13:16:53 -08:00
Joffrey F 1a7e3a2d6d Merge branch 'add-stats-api-support' of https://github.com/nir0s/docker-py into nir0s-add-stats-api-support 2015-02-12 13:15:59 -08:00
Joffrey F 1565464ff0 Merge pull request #490 from nir0s/parallelize-tox-in-travis 
split tests to different tox envs
 2015-02-12 10:19:29 -08:00
nir0s c50795a08a minor 2015-02-12 10:01:42 +02:00
nir0s 893626142c docs fix 2015-02-12 09:58:56 +02:00
nir0s 0379bddeaa added version compliable check 2015-02-12 09:57:46 +02:00
nir0s bbc2121951 fixed docs 2015-02-12 09:49:45 +02:00
nir0s 52702f7da0 removed aggregation for now and added a unit test. also using stream_helper now 2015-02-12 09:48:33 +02:00
nir0s cd36ea9088 split tests to different tox envs 2015-02-12 09:25:49 +02:00
Joffrey F 59d52604b1 Merge pull request #488 from docker/memoryswap 
Container config cleanup
 2015-02-11 14:10:45 -08:00