Commit Graph

517 Commits

Author SHA1 Message Date
Ben Firshman 31e046ee2f Fix travis badge URL
Repository moved from dotcloud to docker

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk> (github: bfirsh)
2014-07-28 17:57:50 -07:00
Joffrey F e2ac293c1e Merge pull request #280 from emonty/remove_auth_from_tests
Protect push tests from environment
2014-07-23 20:26:02 +02:00
Joffrey F 8e45264907 Merge pull request #268 from brutasse/265-dockerignore
Add support for .dockerignore
2014-07-23 20:25:07 +02:00
Bruno Renié 87b4d327d1 Add support for .dockerignore
Fixes #265.

Implementation is a bit more elaborate than docker's implementation and
matches with the one proposed in dotcloud/docker#6869 to handle permission
issues more nicely.
2014-07-23 15:05:53 +02:00
Monty Taylor 5f2c3de6bb Protect push tests from environment
If the tests are run somewhere that somebody has push auth
configured, the auth headers bleed into the tests. Add a mock
to prevent that from happening.
2014-07-22 10:26:46 -07:00
Joffrey F 9e39672daa Merge pull request #279 from dotcloud/0.4.0-release
Release 0.4.0
2014-07-22 17:37:17 +02:00
Joffrey F 429654b4eb Updated ChangeLog and bumped version 2014-07-22 14:23:32 +02:00
Joffrey F 8cdf6f49f3 Merge pull request #278 from samos123/master
Add documentation format of environment variable
2014-07-22 13:22:18 +02:00
Sam Stoelinga 0c147927d2 Add documentation format of environment variable
This fixes #277
2014-07-22 16:05:58 +08:00
Joffrey F d2f49a9db4 Merge pull request #269 from Aigeruth/feature/coverage
Add coverage
2014-07-21 17:03:38 +02:00
Gabor Nagy 8caffe4ef6 Add coverage 2014-07-11 16:13:00 +02:00
Joffrey F 747304d5f0 Merge pull request #250 from dotcloud/momer-tls
Support for TLS auth
2014-07-10 17:24:32 +02:00
Joffrey F 7b8e0cd783 Merge branch 'master' into momer-tls
Conflicts:
	docker/client.py
2014-07-10 17:19:22 +02:00
Joffrey F 72cb3882b0 Merge pull request #264 from dotcloud/tls_alt_api
Improved TLSConfig API
2014-07-10 17:14:36 +02:00
Joffrey F 436a3b1ff9 server_cacert -> ca_cert 2014-07-10 17:14:07 +02:00
Joffrey F 6f557ed733 Fix some urllib3 import issues 2014-07-09 18:37:04 +02:00
Joffrey F ed2b4581d7 Merge pull request #259 from dotcloud/166-complete-parse-host
Support same URL schemes as Docker
2014-07-09 17:34:25 +02:00
Joffrey F 56e454f77b Merge pull request #261 from mmerickel/fix.remote-testing
fix remote testing
2014-07-09 17:33:30 +02:00
Joffrey F d528e7ea51 Incorrect argument list in TLS docs 2014-07-09 17:09:37 +02:00
Joffrey F 8393dbcaff Improved TLSConfig API to be less obscure / more pythonic. Also improved / amended docs 2014-07-08 14:56:48 +02:00
Michael Merickel e15b3bb689 allow docker client to connect to a remote host
to run the tests on a host without using the default unix socket, it's
now possible to specify:

    DOCKER_HOST=tcp://localdocker:4243 env/bin/python setup.py test
2014-07-07 10:03:42 -05:00
Joffrey F db454f01b8 Merge pull request #262 from li4li5li6/fix_ssl_version
fix ssl_version exception when urllib3 version <= 1.5
2014-07-07 16:10:17 +02:00
李超 af91c78454 fix ssl_version exception when urllib3 version <= 1.5 2014-07-07 21:42:42 +08:00
Michael Merickel 272c1f8634 support specifying location of temp folders
TestWithBinds was failing when shared folders are used because /tmp was
not shared from OS X to my VM. This fix allows the location of the temp
folders to be changed via:

    TMPDIR=$(pwd) env/bin/python setup.py test

This also properly cleans up temp folders which were sticking around
before.
2014-07-05 14:44:14 -05:00
Michael Merickel b5e75c4019 fix ListContainers which was failing with "executable true; not found" 2014-07-05 14:20:11 -05:00
Joffrey F 53de7547e1 Support http+unix protocol 2014-07-03 04:20:42 +02:00
Joffrey F d33ba883f1 Fixed base_url related tests 2014-07-03 04:16:08 +02:00
Joffrey F cf050d28a0 Implemented complete parse_host method to handle all accepted values of Client's base_url. Unit tests 2014-07-03 04:11:34 +02:00
Joffrey F 9170219188 Python 3 sees empty lines as \n instead of \r\n (wat). Fixes #257 2014-07-03 02:17:00 +02:00
Joffrey F e6888591eb Raise an exception when tls_ca_cert is provided and tls_verify is false 2014-07-03 01:08:00 +02:00
Joffrey F 123bb8a436 Allow setting Client.verify to false when tls_verify is set to false in TLSConfig 2014-07-03 01:00:39 +02:00
Joffrey F 6080fa5097 Simple TLS configuration doesn't create the ssl_version attribute, use default when mounting adapter 2014-07-03 00:21:07 +02:00
Joffrey F 94cb0bdc13 Fixed bugs, clearer error messages 2014-06-24 21:11:59 +02:00
Joffrey F f06c295d6c Back to -dev version 2014-06-23 20:43:14 +02:00
Joffrey F 59ced5700c Merge pull request #245 from dotcloud/0.3.2-release
0.3.2 release
2014-06-23 11:41:40 -07:00
Joffrey F 72c29ee5cf Added TLS configuration instructions in README.md 2014-06-23 20:32:27 +02:00
Joffrey F 116d1370af * Merge branch 'tls' of github.com:momer/docker-py into momer-tls
* Exported TLS configuration in tls.TLSConfig
* Merged exceptions packagee into pre-existing errors module
* Flake8 fixes
* Bug fixes
2014-06-23 20:15:47 +02:00
Joffrey F b62396053d Updated changelog with last minute changes ; updated default API version in README.md 2014-06-23 19:20:58 +02:00
Joffrey F dc1020fa11 Added support for Python 3.4 in setup.py classifiers 2014-06-23 19:16:50 +02:00
Joffrey F dead4ca547 Updated version 2014-06-23 19:16:50 +02:00
Joffrey F 9421816c88 Updated Changelog with 0.3.2 release info 2014-06-23 19:16:50 +02:00
Joffrey F a333a3510e Reverted c3ebce91b0 2014-06-22 15:55:39 -07:00
Joffrey F c3ebce91b0 docker is now a namespace package 2014-06-23 00:40:57 +02:00
Joffrey F 8ad7bc9189 Merge pull request #249 from aliva/master
get size from Client.containers
2014-06-22 15:31:56 -07:00
Ali Vakilzade ea728c1bd5 get size from Client.containers 2014-06-22 21:10:28 +04:30
Ali Vakilzade a2f0f1b2dd get size from Client.containers 2014-06-22 15:52:24 +04:30
Joffrey F adbf19b10a Merge pull request #246 from d11wtq/feature/resize
Add resize() method to Client
2014-06-21 17:11:33 -07:00
d11wtq 1ec551cbe7 Add resize() method to Client 2014-06-21 12:21:44 +00:00
Joffrey F a8e03d32bb Fixed port bindings conversion to support legacy port bindings. Fixes #135 2014-06-21 02:37:57 +02:00
Joffrey F 28cb2c5994 Added python3.4 in tox.ini 2014-06-20 21:08:58 +02:00