summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Don't fallback to HTTP unless insecure_registry is specified when ↵insecure_registryJoffrey F2014-08-222-10/+22
| | | | pushing/pulling
* Merge branch 'cameronmaske-push-tags'Joffrey F2014-08-223-4/+37
|\
| * pep8 fixJoffrey F2014-08-221-1/+3
| |
| * Allow pushing a single tag.Cameron Maske2014-08-223-4/+35
|/ | | | Closes #282
* Version back to x-devJoffrey F2014-08-221-1/+1
|
* Merge branch 'ifraixedes-patch-1'Joffrey F2014-08-221-1/+7
|\
| * Amended create_container documentationJoffrey F2014-08-221-1/+7
| |\ |/ /
| * Added comment for `command` argumentIvan Fraixedes2014-07-151-0/+2
| | | | | | Added comment for the variable type of `create_container`'s `command` argument
* | Merge pull request #291 from yograterol/masterJoffrey F2014-08-222-2/+33
|\ \ | | | | | | Volumes parameter on create_container should be validated as string
| * | Change str type for six.string_types to py3 compatibilityYohan Graterol2014-08-201-2/+2
| | |
| * | Create test for volume as stringYohan Graterol2014-08-171-0/+25
| | |
| * | Remove unicode type in isinstanceYohan Graterol2014-08-171-2/+2
| | |
| * | Validation for volumes parameters as string in _container_configYohan Graterol2014-08-171-0/+3
| | |
| * | PEP8 compliance - space between numbers and operatorsYohan Graterol2014-08-171-2/+2
| | |
| * | Added validation for volumes parameter - Issue #276Yohan Graterol2014-08-171-0/+3
| | |
* | | Merge pull request #292 from mpetazzoni/stop-timeoutJoffrey F2014-08-202-7/+10
|\ \ \ | |/ / |/| | Stop timeout should be added to the request timeout
| * | Stop timeout should be added to the request timeoutMaxime Petazzoni2014-08-192-7/+10
|/ / | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #287 from leonidlm/feature/adding-memory-limit-string-supportJoffrey F2014-08-083-0/+101
|\ \ | | | | | | Adding units specification to mem_limit variable
| * | Adding tests for mem_limit string conversion + adding default unitLeonid Mirsky2014-08-053-6/+80
| | |
| * | Fixing styling issuesLeonid Mirsky2014-08-051-6/+9
| | |
| * | Adding value verifications for mem_limit string representationLeonid Mirsky2014-08-051-6/+20
| | |
| * | Adding units specification to mem_limit variableLeonid Mirsky2014-08-052-0/+10
| | |
* | | Merge pull request #288 from dnephin/unpin_depsJoffrey F2014-08-081-7/+10
|\ \ \ | |/ / |/| | Don't use pinned dependencies
| * | Resolves #101, don't use pinned dependencies.Daniel Nephin2014-08-081-7/+10
|/ / | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | Merge pull request #285 from silarsis/patch-1Joffrey F2014-07-311-1/+1
|\ \ | | | | | | Added a timeout to the https ping
| * | Added a timeout to the https pingKevin Littlejohn2014-07-311-1/+1
|/ / | | | | 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.
* | Merge pull request #283 from bfirsh/fix-travis-badgeJoffrey F2014-07-291-1/+1
|\ \ | | | | | | Fix travis badge URL
| * | Fix travis badge URLBen Firshman2014-07-281-1/+1
|/ / | | | | | | | | | | | | | | 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)
* | Merge pull request #280 from emonty/remove_auth_from_testsJoffrey F2014-07-231-2/+10
|\ \ | | | | | | Protect push tests from environment
| * | Protect push tests from environmentMonty Taylor2014-07-221-2/+10
| |/ | | | | | | | | | | 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.
* | Merge pull request #268 from brutasse/265-dockerignoreJoffrey F2014-07-234-4/+120
|\ \ | | | | | | Add support for .dockerignore
| * | Add support for .dockerignoreBruno Renié2014-07-234-4/+121
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #279 from dotcloud/0.4.0-release0.4.0Joffrey F2014-07-222-1/+20
|\ \ \ | | | | | | | | Release 0.4.0
| * | | Updated ChangeLog and bumped versionJoffrey F2014-07-222-1/+20
|/ / /
* | | Merge pull request #278 from samos123/masterJoffrey F2014-07-221-0/+3
|\ \ \ | | | | | | | | Add documentation format of environment variable
| * | | Add documentation format of environment variableSam Stoelinga2014-07-221-0/+3
|/ / / | | | | | | This fixes #277
* | | Merge pull request #269 from Aigeruth/feature/coverageJoffrey F2014-07-214-4/+21
|\ \ \ | |_|/ |/| | Add coverage
| * | Add coverageGabor Nagy2014-07-114-4/+21
|/ /
* | Merge pull request #250 from dotcloud/momer-tlsJoffrey F2014-07-107-3/+188
|\ \ | | | | | | Support for TLS auth
| * \ Merge branch 'master' into momer-tlsJoffrey F2014-07-1010-28/+165
| |\ \ | |/ / |/| | | | | | | | Conflicts: docker/client.py
* | | Merge pull request #259 from dotcloud/166-complete-parse-hostJoffrey F2014-07-095-16/+109
|\ \ \ | | | | | | | | Support same URL schemes as Docker
| * | | Support http+unix protocolJoffrey F2014-07-031-0/+2
| | | |
| * | | Fixed base_url related testsJoffrey F2014-07-031-4/+4
| | | |
| * | | Implemented complete parse_host method to handle all accepted values of ↵Joffrey F2014-07-034-12/+103
| | |/ | |/| | | | | | | Client's base_url. Unit tests
* | | Merge pull request #261 from mmerickel/fix.remote-testingJoffrey F2014-07-091-5/+15
|\ \ \ | |/ / |/| | fix remote testing
| * | allow docker client to connect to a remote hostMichael Merickel2014-07-071-2/+4
| | | | | | | | | | | | | | | | | | | | | 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
| * | support specifying location of temp foldersMichael Merickel2014-07-051-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | fix ListContainers which was failing with "executable true; not found"Michael Merickel2014-07-051-2/+2
|/ /
* | Python 3 sees empty lines as \n instead of \r\n (wat). Fixes #257Joffrey F2014-07-031-1/+1
| |
* | Back to -dev versionJoffrey F2014-06-231-1/+1
| |