summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
* Handle ID truncate on client side in containers list (and changed default ↵client_side_truncJoffrey F2015-04-221-1/+4
| | | | from True to False)
* improved Ulimit classJoffrey F2015-04-221-7/+22
|
* Add support for ulimits in host_configJoffrey F2015-04-224-3/+57
|
* Modify expand_registry_url to support v2 private registries.support_v2_private_registryJoffrey F2015-04-223-3/+7
|
* Merge branch 'sam/import-improvements' of ↵Joffrey F2015-04-222-46/+100
|\ | | | | | | | | | | | | | | | | https://github.com/ssssam/docker-py into ssssam-sam/import-improvements Conflicts: docker/client.py docker/unixconn/unixconn.py tests/integration_test.py
| * Rewrite Client.import_image() and add less-magical versionsSam Thursfield2015-01-051-19/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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()`.
| * Rework Unix connection code so that 'chunked' transfers workSam Thursfield2015-01-052-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'pull_auth' of https://github.com/hibooboo2/docker-py into ↵Joffrey F2015-04-221-10/+15
|\ \ | | | | | | | | | hibooboo2-pull_auth
| * | Add auth config to pullJames Harris2015-02-181-10/+15
| | |
* | | 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
| | |/ / / | |/| | |
* | | | | removed unneeded importsYuval Kohavi2015-04-171-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* | | | | Adding port utils to split port rangesYuval Kohavi2015-04-032-0/+90
|/ / / / | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* | | | 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 branch 'master' of github.com:docker/docker-pyJoffrey F2015-03-202-6/+16
|\ \ \ \
| * \ \ \ Merge pull request #531 from josephpage/dockerignore-eof-windowsJoffrey F2015-03-201-1/+1
| |\ \ \ \ | | | | | | | | | | | | Windows : fix EOL of .dockerignore file
| | * | | | Windows : str.splitlines instead of str.splitJoseph Page2015-03-201-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | To be able to read `.dockerignore` file edited on Windows, python-py may use the multi-platform split function `str.splitlines()` Ref : https://docs.python.org/2/library/stdtypes.html#str.splitlines
| * | | | Merge pull request #532 from aanand/labelsJoffrey F2015-03-202-5/+15
| |\ \ \ \ | | | | | | | | | | | | Labels
| | * | | | Finish labels implementation, add tests and docsAanand Prasad2015-03-201-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| | * | | | Update default API version to 1.18Aanand Prasad2015-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| | * | | | Implemented labels for docker-pyAndré Martins2015-03-172-4/+15
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: André Martins <martins@noironetworks.com>
* | | | | Use get instead of bracket notationJoffrey F2015-03-201-1/+1
| | | | |
* | | | | Merge branch 'fix-port-host-net' of https://github.com/ssanderson/docker-py ↵Joffrey F2015-03-201-2/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into ssanderson-fix-port-host-net
| * | | | MAINT: Don't re-index multiple times.Scott Sanderson2015-03-161-2/+2
| | | | |
| * | | | BUG: Don't barf on Client.port when no port settings provided.Scott Sanderson2015-03-161-0/+6
| | | | |
* | | | | Back to dev versionJoffrey F2015-03-201-1/+1
| |/ / / |/| | |
* | | | Bumped version1.1.0-releaseJoffrey F2015-03-101-1/+1
| | | |
* | | | Don't allow 'version' param in AutoVersionClient ctorJoffrey F2015-03-051-0/+4
| | | |
* | | | Streamline exceptions for auto version ; retrieve_server_version into ↵Joffrey F2015-03-051-7/+12
| | | | | | | | | | | | | | | | protected method
* | | | detect server version when version="auto"Tomas Tomecek2015-03-052-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | heavily inspired by PR#281 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* | | | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-03-042-1/+7
|\ \ \ \
| * | | | Handle passwords with ':' characters.dlorenc2015-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: dlorenc <lorenc.d@gmail.com>
| * | | | Merge pull request #502 from cpuguy83/498_dockerignore_special_namesJoffrey F2015-02-271-0/+6
| |\ \ \ \ | | | | | | | | | | | | Add special cases for .dockerignore
| | * | | | Add special cases for .dockerignoreBrian Goff2015-02-241-0/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #498 Allowing `Dockerfile` and `.dockerignore` in the exclusion filter completely breaks the build on docker < 1.5 In Docker 1.5 these entries are treated as special cases when included in the .dockerignore and are still sent as part of the context. The daemon ends up excluding them from any `ADD`, `COPY`, and cache validation. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* | | | | Only call decode if Python 3.xJoffrey F2015-03-041-1/+3
| | | | |
* | | | | Merge branch 'py3-json' of https://github.com/ssanderson/docker-py into ↵Joffrey F2015-03-041-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | ssanderson-py3-json
| * | | | BUG: Fix errors in Python 3 from JSON-decoding bytes.Scott Sanderson2015-02-241-1/+1
| |/ / /
* | | | shorter convert_to_hostnameJoffrey F2015-02-271-3/+1
| | | |
* | | | Update resolve_authconfig to bring it in line with Docker clientAanand Prasad2015-02-272-29/+20
|/ / / | | | | | | | | | | | | | | | | | | Instead of expanding the registry name we're looking for to a full URL, strip entries in the authconfig down to just the hostname. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Resolves #497 - add support for dockerfileDaniel Nephin2015-02-201-2/+8
| | | | | | | | | | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* | | Back to dev versionJoffrey F2015-02-161-1/+1
|/ /
* | Bumped version to 1.0.0Joffrey F2015-02-121-1/+1
| |
* | Added api_version propertyJoffrey F2015-02-121-0/+4
| |
* | Remove unused codeJoffrey F2015-02-121-7/+0
| |
View Lorry Controller Status