Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't fallback to HTTP unless insecure_registry is specified when ↵insecure_registry | Joffrey F | 2014-08-22 | 2 | -10/+22 |
| | | | | pushing/pulling | ||||
* | Merge branch 'cameronmaske-push-tags' | Joffrey F | 2014-08-22 | 3 | -4/+37 |
|\ | |||||
| * | pep8 fix | Joffrey F | 2014-08-22 | 1 | -1/+3 |
| | | |||||
| * | Allow pushing a single tag. | Cameron Maske | 2014-08-22 | 3 | -4/+35 |
|/ | | | | Closes #282 | ||||
* | Version back to x-dev | Joffrey F | 2014-08-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'ifraixedes-patch-1' | Joffrey F | 2014-08-22 | 1 | -1/+7 |
|\ | |||||
| * | Amended create_container documentation | Joffrey F | 2014-08-22 | 1 | -1/+7 |
| |\ |/ / | |||||
| * | Added comment for `command` argument | Ivan Fraixedes | 2014-07-15 | 1 | -0/+2 |
| | | | | | | Added comment for the variable type of `create_container`'s `command` argument | ||||
* | | Merge pull request #291 from yograterol/master | Joffrey F | 2014-08-22 | 2 | -2/+33 |
|\ \ | | | | | | | Volumes parameter on create_container should be validated as string | ||||
| * | | Change str type for six.string_types to py3 compatibility | Yohan Graterol | 2014-08-20 | 1 | -2/+2 |
| | | | |||||
| * | | Create test for volume as string | Yohan Graterol | 2014-08-17 | 1 | -0/+25 |
| | | | |||||
| * | | Remove unicode type in isinstance | Yohan Graterol | 2014-08-17 | 1 | -2/+2 |
| | | | |||||
| * | | Validation for volumes parameters as string in _container_config | Yohan Graterol | 2014-08-17 | 1 | -0/+3 |
| | | | |||||
| * | | PEP8 compliance - space between numbers and operators | Yohan Graterol | 2014-08-17 | 1 | -2/+2 |
| | | | |||||
| * | | Added validation for volumes parameter - Issue #276 | Yohan Graterol | 2014-08-17 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #292 from mpetazzoni/stop-timeout | Joffrey F | 2014-08-20 | 2 | -7/+10 |
|\ \ \ | |/ / |/| | | Stop timeout should be added to the request timeout | ||||
| * | | Stop timeout should be added to the request timeout | Maxime Petazzoni | 2014-08-19 | 2 | -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-support | Joffrey F | 2014-08-08 | 3 | -0/+101 |
|\ \ | | | | | | | Adding units specification to mem_limit variable | ||||
| * | | Adding tests for mem_limit string conversion + adding default unit | Leonid Mirsky | 2014-08-05 | 3 | -6/+80 |
| | | | |||||
| * | | Fixing styling issues | Leonid Mirsky | 2014-08-05 | 1 | -6/+9 |
| | | | |||||
| * | | Adding value verifications for mem_limit string representation | Leonid Mirsky | 2014-08-05 | 1 | -6/+20 |
| | | | |||||
| * | | Adding units specification to mem_limit variable | Leonid Mirsky | 2014-08-05 | 2 | -0/+10 |
| | | | |||||
* | | | Merge pull request #288 from dnephin/unpin_deps | Joffrey F | 2014-08-08 | 1 | -7/+10 |
|\ \ \ | |/ / |/| | | Don't use pinned dependencies | ||||
| * | | Resolves #101, don't use pinned dependencies. | Daniel Nephin | 2014-08-08 | 1 | -7/+10 |
|/ / | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com> | ||||
* | | Merge pull request #285 from silarsis/patch-1 | Joffrey F | 2014-07-31 | 1 | -1/+1 |
|\ \ | | | | | | | Added a timeout to the https ping | ||||
| * | | Added a timeout to the https ping | Kevin Littlejohn | 2014-07-31 | 1 | -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-badge | Joffrey F | 2014-07-29 | 1 | -1/+1 |
|\ \ | | | | | | | Fix travis badge URL | ||||
| * | | Fix travis badge URL | Ben Firshman | 2014-07-28 | 1 | -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_tests | Joffrey F | 2014-07-23 | 1 | -2/+10 |
|\ \ | | | | | | | Protect push tests from environment | ||||
| * | | Protect push tests from environment | Monty Taylor | 2014-07-22 | 1 | -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-dockerignore | Joffrey F | 2014-07-23 | 4 | -4/+120 |
|\ \ | | | | | | | Add support for .dockerignore | ||||
| * | | Add support for .dockerignore | Bruno Renié | 2014-07-23 | 4 | -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.0 | Joffrey F | 2014-07-22 | 2 | -1/+20 |
|\ \ \ | | | | | | | | | Release 0.4.0 | ||||
| * | | | Updated ChangeLog and bumped version | Joffrey F | 2014-07-22 | 2 | -1/+20 |
|/ / / | |||||
* | | | Merge pull request #278 from samos123/master | Joffrey F | 2014-07-22 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Add documentation format of environment variable | ||||
| * | | | Add documentation format of environment variable | Sam Stoelinga | 2014-07-22 | 1 | -0/+3 |
|/ / / | | | | | | | This fixes #277 | ||||
* | | | Merge pull request #269 from Aigeruth/feature/coverage | Joffrey F | 2014-07-21 | 4 | -4/+21 |
|\ \ \ | |_|/ |/| | | Add coverage | ||||
| * | | Add coverage | Gabor Nagy | 2014-07-11 | 4 | -4/+21 |
|/ / | |||||
* | | Merge pull request #250 from dotcloud/momer-tls | Joffrey F | 2014-07-10 | 7 | -3/+188 |
|\ \ | | | | | | | Support for TLS auth | ||||
| * \ | Merge branch 'master' into momer-tls | Joffrey F | 2014-07-10 | 10 | -28/+165 |
| |\ \ | |/ / |/| | | | | | | | | Conflicts: docker/client.py | ||||
* | | | Merge pull request #259 from dotcloud/166-complete-parse-host | Joffrey F | 2014-07-09 | 5 | -16/+109 |
|\ \ \ | | | | | | | | | Support same URL schemes as Docker | ||||
| * | | | Support http+unix protocol | Joffrey F | 2014-07-03 | 1 | -0/+2 |
| | | | | |||||
| * | | | Fixed base_url related tests | Joffrey F | 2014-07-03 | 1 | -4/+4 |
| | | | | |||||
| * | | | Implemented complete parse_host method to handle all accepted values of ↵ | Joffrey F | 2014-07-03 | 4 | -12/+103 |
| | |/ | |/| | | | | | | | Client's base_url. Unit tests | ||||
* | | | Merge pull request #261 from mmerickel/fix.remote-testing | Joffrey F | 2014-07-09 | 1 | -5/+15 |
|\ \ \ | |/ / |/| | | fix remote testing | ||||
| * | | allow docker client to connect to a remote host | Michael Merickel | 2014-07-07 | 1 | -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 folders | Michael Merickel | 2014-07-05 | 1 | -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 Merickel | 2014-07-05 | 1 | -2/+2 |
|/ / | |||||
* | | Python 3 sees empty lines as \n instead of \r\n (wat). Fixes #257 | Joffrey F | 2014-07-03 | 1 | -1/+1 |
| | | |||||
* | | Back to -dev version | Joffrey F | 2014-06-23 | 1 | -1/+1 |
| | |