Commit Graph

745 Commits

Author SHA1 Message Date
Joffrey F c76fd8d914 Merge branch 'cameronmaske-push-tags' 2014-08-22 17:09:05 +02:00
Joffrey F 9999cb0663 pep8 fix 2014-08-22 17:08:57 +02:00
Cameron Maske 5800c4ab06 Allow pushing a single tag.
Closes #282
2014-08-22 10:14:51 -04:00
Joffrey F 710f3725b6 Version back to x-dev 2014-08-22 13:48:01 +02:00
Joffrey F 7dde830e6e Merge branch 'ifraixedes-patch-1' 2014-08-22 13:26:25 +02:00
Joffrey F 24eb16c33a Amended create_container documentation 2014-08-22 13:26:03 +02:00
Joffrey F dba1c45454 Merge pull request #291 from yograterol/master
Volumes parameter on create_container should be validated as string
2014-08-22 13:12:41 +02:00
Yohan Graterol 23a57c29ad Change str type for six.string_types to py3 compatibility 2014-08-20 10:28:56 -05:00
Joffrey F 15b22e7d16 Merge pull request #292 from mpetazzoni/stop-timeout
Stop timeout should be added to the request timeout
2014-08-20 14:32:10 +02:00
Maxime Petazzoni 97366f6b60 Stop timeout should be added to the request timeout
Using the max of the stop timeout and request timeout did not entirely
make sure that a stop timeout greater than a request timeout wouldn't
fail prematurely with a HTTPTimeout exception. The correct behavior is
to add the timeouts together, as the stop timeout is understood to be
part of the "request processing time". Any transport-level timeout thus
comes in addition to that.

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
2014-08-19 10:37:54 -07:00
Yohan Graterol 28e27eb81a Create test for volume as string 2014-08-17 02:42:35 -05:00
Yohan Graterol 10b11a3f98 Remove unicode type in isinstance 2014-08-17 02:33:38 -05:00
Yohan Graterol 0a2940a8f0 Validation for volumes parameters as string in _container_config 2014-08-17 02:27:00 -05:00
Yohan Graterol 80b3688e81 PEP8 compliance - space between numbers and operators 2014-08-17 02:24:22 -05:00
Yohan Graterol 75c7931f3d Added validation for volumes parameter - Issue #276 2014-08-17 02:23:32 -05:00
Joffrey F 698732636c Merge pull request #287 from leonidlm/feature/adding-memory-limit-string-support
Adding units specification to mem_limit variable
2014-08-08 21:00:16 +02:00
Joffrey F f2ea67badb Merge pull request #288 from dnephin/unpin_deps
Don't use pinned dependencies
2014-08-08 20:58:27 +02:00
Daniel Nephin 59c6d5c586 Resolves #101, don't use pinned dependencies.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-08-08 11:10:26 -04:00
Leonid Mirsky 98a4aa994c Adding tests for mem_limit string conversion + adding default unit 2014-08-05 22:02:02 +03:00
Leonid Mirsky 18f2b6ff91 Fixing styling issues 2014-08-05 15:47:02 +03:00
Leonid Mirsky e5edaf4e0b Adding value verifications for mem_limit string representation 2014-08-05 15:36:06 +03:00
Leonid Mirsky 019468dad8 Adding units specification to mem_limit variable 2014-08-05 11:40:08 +03:00
Joffrey F 14f9c07b01 Merge pull request #285 from silarsis/patch-1
Added a timeout to the https ping
2014-07-31 11:58:37 +02:00
Kevin Littlejohn e607eaa19c Added a timeout to the https ping
For those not using https who might have it firewalled, this request without a timeout causes significant delay. Adding a moderately generous timeout shouldn't affect anyone negatively, but will make things a bit nicer otherwise.
2014-07-31 11:08:39 +10:00
Joffrey F 18758430d0 Merge pull request #283 from bfirsh/fix-travis-badge
Fix travis badge URL
2014-07-29 17:13:10 +02:00
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
Ivan Fraixedes 3987a8f5e5 Added comment for `command` argument
Added comment for the variable type of `create_container`'s `command` argument
2014-07-15 15:35:49 +01:00
Gabor Nagy 8caffe4ef6 Add coverage 2014-07-11 16:13:00 +02:00
Robert Glen adcfa4b29e Should be done for StringIO objects as well 2014-07-10 09:06:44 -07: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
Robert Glen d0e984347a Fixed bug in utils.mkbuildcontext for BytesIO Dockerfiles
- resetting dockerfile seek position to 0 after dockerfile.getvalue() is called
- prevents traceback on line utils.py line 43
- 'IOError("end of file reached")' in tarfile.py
2014-07-09 16:29:37 -07: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