summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Handle ID truncate on client side in containers list (and changed default ↵client_side_truncJoffrey F2015-04-223-6/+13
| | | | from True to False)
* revertJoffrey F2015-04-221-6/+0
|
* Added integration testJoffrey F2015-04-222-0/+35
|
* Merge pull request #554 from docker/ulimit_supportJoffrey F2015-04-2210-9/+145
|\ | | | | ulimits support
| * ulimits: Updated docsulimit_supportJoffrey F2015-04-222-0/+3
| |
| * Improved ulimit testsJoffrey F2015-04-222-1/+26
| |
| * improved Ulimit classJoffrey F2015-04-221-7/+22
| |
| * assertRaises 2.6 compatJoffrey F2015-04-221-6/+3
| |
| * Add tests for ulimitsJoffrey F2015-04-221-4/+34
| |
| * Add support for ulimits in host_configJoffrey F2015-04-224-3/+57
| |
| * BaseTestCase shims assertInJoffrey F2015-04-222-2/+14
|/
* Merge pull request #551 from docker/support_v2_private_registryJoffrey F2015-04-223-3/+7
|\ | | | | Modify expand_registry_url to support v2 private registries.
| * Modify expand_registry_url to support v2 private registries.support_v2_private_registryJoffrey F2015-04-223-3/+7
|/
* Merge branch 'ssssam-sam/import-improvements'Joffrey F2015-04-226-69/+330
|\
| * Merge branch 'sam/import-improvements' of ↵Joffrey F2015-04-226-69/+330
| |\ |/ / | | | | | | | | | | | | | | https://github.com/ssssam/docker-py into ssssam-sam/import-improvements Conflicts: docker/client.py docker/unixconn/unixconn.py tests/integration_test.py
| * Add integration tests for Client.import_image() functionSam Thursfield2015-01-051-2/+160
| | | | | | | | | | | | Currently TestImportFromStream fails, because something is going wrong with the HTTP chunked transfer-encoding. This didn't work before, either (for a different reason).
| * docs: Add specific import_image() variantsSam Thursfield2015-01-051-0/+42
| |
| * Rewrite Client.import_image() and add less-magical versionsSam Thursfield2015-01-052-27/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than have one function that can do 5 things and attempts to guess what the user wanted, it's good to have a function for each possible method of importing an image. Error cases are handled a lot better this way. The unit test test_import_image_from_file() was changed to be test_import_image_from_bytes(), because if we try to import a temporary file in the test, the 'data' parameter of the 'fake_request' object is an instance of a funny internal type like <_io.BufferedReader name='/tmp/tmpc9chux'> and it's very hard to match such a thing with `mock.assert_called_with()`.
| * docs: Clarify import_image() docsSam Thursfield2015-01-051-7/+11
| |
| * Rework Unix connection code so that 'chunked' transfers workSam Thursfield2015-01-054-31/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows streaming a system to the 'import' command, rather than having to read the whole thing into memory before sending it. Previously both the UnixAdapter and the docker.Client objects would track the 'base URL' of the Docker daemon (socket path in the case of local Unix-domain socket connections). The Client object would construct URLs which contained the path to the socket with the path of the Docker API call appended. The UnixHTTPConnection instance would then remove the known socket path from the URL. This relied on all calls going through the HTTPConnection.request() function, where the URL could be rewritten. In the case of 'chunked' HTTP POST requests this doesn't happen, so such calls would request a path still including the socket path and would receive a 404 error. The client now constructs URLs containing just the path of the desired API endpoint, and expects the Unix socket transport to know the path to the Docker daemon's socket.
* | Merge branch 'hibooboo2-pull_auth'Joffrey F2015-04-222-10/+17
|\ \
| * | Small docs clarificationJoffrey F2015-04-221-0/+1
| | |
| * | Merge branch 'pull_auth' of https://github.com/hibooboo2/docker-py into ↵Joffrey F2015-04-222-10/+16
| |\ \ |/ / / | | | | | | hibooboo2-pull_auth
| * | Add auth config to pullJames Harris2015-02-182-10/+16
| | |
* | | Merge branch 'luzfcb-patch-1'Joffrey F2015-04-221-2/+5
|\ \ \
| * \ \ Merge branch 'patch-1' of https://github.com/luzfcb/docker-py into ↵Joffrey F2015-04-221-2/+5
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | luzfcb-patch-1 Conflicts: setup.py
| * | | added URL for this project in setup configurationFábio C. Barrionuevo da Luz2015-03-311-0/+1
| | | |
* | | | Merge branch 'terminalmage-version_info'Joffrey F2015-04-222-1/+2
|\ \ \ \
| * | | | Automatically generate version_info from version stringJoffrey F2015-04-221-1/+1
| | | | |
| * | | | Merge branch 'version_info' of https://github.com/terminalmage/docker-py ↵Joffrey F2015-04-222-1/+2
| |\ \ \ \ |/ / / / / | | | | | | | | | | into terminalmage-version_info
| * | | | Add a version_info attributeErik Johnson2015-04-032-1/+2
| |/ / / | | | | | | | | | | | | | | | | This makes comparing docker-py versions *much* easier. Having to account for the potential of a "-dev" suffix is a PITA.
* | | | Merge pull request #530 from dlorenc/masterJoffrey F2015-04-222-2/+8
|\ \ \ \ | | | | | | | | | | Add assert_fingerprint option.
| * | | | Add assert_fingerprint option.dlorenc2015-03-192-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: dlorenc <lorenc.d@gmail.com>
* | | | | Merge pull request #537 from onorua/masterJoffrey F2015-04-222-3/+11
|\ \ \ \ \ | | | | | | | | | | | | IPC sharing implementation
| * | | | | IPC sharing implementationYaroslav Molochko2015-03-302-3/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #544 from uvgroovy/masterJoffrey F2015-04-224-1/+186
|\ \ \ \ \ | |/ / / / |/| | | | parse port ranges
| * | | | removed unneeded importsYuval Kohavi2015-04-171-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
| * | | | line lengthYuval Kohavi2015-04-111-3/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
| * | | | python 2.6 compatibleYuval Kohavi2015-04-111-6/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
| * | | | added ports to setup.pyYuval Kohavi2015-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
| * | | | Adding port utils to split port rangesYuval Kohavi2015-04-033-0/+185
|/ / / / | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* | | | Use assertRaises in a backward compatible fashionJoffrey F2015-03-251-2/+4
| | | |
* | | | Added assertIn shim for py2.6Joffrey F2015-03-251-0/+5
| | | |
* | | | Merge branch 'ewindisch-secopt'Joffrey F2015-03-254-4/+34
|\ \ \ \
| * | | | docs and unit test for security_optJoffrey F2015-03-252-0/+14
| | | | |
| * | | | Added some type and version checks; removed security_opt from ↵Joffrey F2015-03-252-5/+14
| | | | | | | | | | | | | | | | | | | | container_config (as this is invalid)
| * | | | Add security_opt for create/startEric Windisch2015-03-242-7/+14
|/ / / / | | | | | | | | | | | | Signed-off-by: Eric Windisch <eric@windisch.us>
* | | | Merge pull request #533 from ynachiket/masterJoffrey F2015-03-211-1/+1
|\ \ \ \ | | | | | | | | | | Fixed stats related typo in api.md
| * | | | Fixed stats related typo in api.mdynachiket2015-03-211-1/+1
|/ / / /
* | | | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-03-205-8/+67
|\ \ \ \
View Lorry Controller Status