Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Added py3-based dockerfile | Joffrey F | 2015-07-22 | 2 | -1/+7 | |
| | | | | ||||||
| * | | | Updated changelog for 1.3.1 | Joffrey F | 2015-07-22 | 1 | -0/+22 | |
| | | | | ||||||
| * | | | Bumped version | Joffrey F | 2015-07-22 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #682 from docker/moutten-fix-build-auth | Joffrey F | 2015-07-22 | 2 | -9/+8 | |
|\ \ \ | | | | | | | | | Switch to send full AuthConfig object for build action | |||||
| * | | | Make build auth work with API versions < 1.19 toomoutten-fix-build-auth | Joffrey F | 2015-07-20 | 1 | -3/+8 | |
| | | | | ||||||
| * | | | Merge branch 'fix-build-auth' of https://github.com/moutten/docker-py into ↵ | Joffrey F | 2015-07-20 | 2 | -7/+1 | |
| |\ \ \ | | | | | | | | | | | | | | | | moutten-fix-build-auth | |||||
| | * | | | Switch to send full AuthConfig object for build action | Matt Outten | 2015-07-17 | 2 | -7/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support the docker API for version 1.7+, this command changes the way the `X-Registry-Config` header is sent when attempting to build an image. | |||||
* | | | | | Merge pull request #685 from paulbellamy/master | Joffrey F | 2015-07-21 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix integration tests | |||||
| * | | | | | Fix integration tests. | Paul Bellamy | 2015-07-21 | 1 | -2/+2 | |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Forgot to update them in 33e1a58 Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com> | |||||
* | | | | | Merge pull request #680 from aanand/fix-timestamp-conversion | Joffrey F | 2015-07-21 | 3 | -6/+6 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Enforce UTC datetimes in arguments to `events()` | |||||
| * | | | | Enforce UTC datetimes in arguments to `events()` | Aanand Prasad | 2015-07-21 | 3 | -6/+6 | |
| | |/ / | |/| | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | |||||
* | | | | Merge pull request #674 from estesp/use-docker-host-in-tests | Aanand Prasad | 2015-07-21 | 1 | -3/+4 | |
|\ \ \ \ | | | | | | | | | | | Update all client instances in integration tests to use DOCKER_HOST | |||||
| * | | | | Update all client instances in integration tests to use DOCKER_HOST | Phil Estes | 2015-07-14 | 1 | -3/+4 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In testing Docker master with the latest docker-py release, a few new tests exist which don't set the base_url, which is not the default unix socket location when Docker's integration tests are running. Also, there is no guarantee syslog can be reached from a test container so I wrapped that test with the NOT_ON_HOST skip logic. Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp) | |||||
* | | | | Merge pull request #683 from docker/exec_create_check_dict | Aanand Prasad | 2015-07-21 | 1 | -0/+1 | |
|\ \ \ \ | |_|/ / |/| | | | Added check_resource decorator to exec_create | |||||
| * | | | Added check_resource decorator to exec_createexec_create_check_dict | Joffrey F | 2015-07-20 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Merge branch 'master' of github.com:docker/docker-py | Joffrey F | 2015-07-20 | 3 | -2/+12 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #678 from pdericson/docs | Joffrey F | 2015-07-20 | 1 | -2/+6 | |
| |\ \ \ | | | | | | | | | | | Minor fixes for docs/api.md | |||||
| | * | | | docs/api.md: rework stats params | Peter Ericson | 2015-07-19 | 1 | -1/+5 | |
| | | | | | ||||||
| | * | | | docs/api.md: singal -> signal | Peter Ericson | 2015-07-19 | 1 | -1/+1 | |
| | |/ / | ||||||
| * | | | Merge pull request #676 from larsks/feature/notfound-on-404 | Aanand Prasad | 2015-07-20 | 2 | -0/+6 | |
| |\ \ \ | | |/ / | |/| | | return NotFound on 404 errors | |||||
| | * | | return NotFound on 404 errors | Lars Kellogg-Stedman | 2015-07-17 | 2 | -0/+6 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | This changes raises docker.errors.NotFound on 404 errors. This gives client code the ability to differentiate between "an image does not exist" and "you are using the api incorrectly". This inherits from docker.errors.APIError so it will not affect any existing code. | |||||
* | | | Merge branch 'aanand-remove-registry-ping' | Joffrey F | 2015-07-20 | 7 | -31/+143 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Use constant for deprecation message in auth.py | Joffrey F | 2015-07-20 | 2 | -6/+8 | |
| | | | ||||||
| * | | Stop pinging registries from the client | Aanand Prasad | 2015-07-20 | 7 | -28/+138 | |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The daemon already pings the registry, so doing it on our end is redundant and error-prone. The `insecure_registry` argument to `push()`, `pull()` and `login()` has been deprecated - in the latter case, it wasn't being used anyway. The `insecure` argument to `docker.auth.resolve_repository_name()` has also been deprecated. `docker.utils.ping_registry()` has been deprecated. `docker.auth.expand_registry_url()` has been removed. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com> | |||||
* | | Merge branch 'a-ba-fix-premature-eof' | Joffrey F | 2015-07-09 | 1 | -1/+1 | |
|\ \ | ||||||
| * \ | Merge branch 'fix-premature-eof' of https://github.com/a-ba/docker-py into ↵ | Joffrey F | 2015-07-09 | 1 | -1/+1 | |
| |\ \ |/ / / | | | | | | | | | | | | | | | | a-ba-fix-premature-eof Conflicts: docker/client.py | |||||
| * | | fix premature EOF detection in streams | Anthony Baire | 2015-06-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | The docker engine may send empty chunks of data in the stream (especially since https://github.com/docker/docker/pull/13033) They should not be taken for EOF Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr> | |||||
* | | | Back to dev version | Joffrey F | 2015-07-09 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #671 from docker/1.3.0-release1.3.0 | Joffrey F | 2015-07-09 | 4 | -17/+51 | |
|\ \ \ | | | | | | | | | 1.3.0 release | |||||
| * | | | websocket-client for all versions1.3.0-release | Joffrey F | 2015-07-08 | 1 | -3/+1 | |
| | | | | ||||||
| * | | | Updated changelog | Joffrey F | 2015-07-08 | 1 | -0/+49 | |
| | | | | ||||||
| * | | | Bumped version to 1.3.0 | Joffrey F | 2015-07-08 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Removed execute() method | Joffrey F | 2015-07-08 | 1 | -13/+0 | |
|/ / / | ||||||
* | | | Added missing `Client.load_image` docs | Joffrey F | 2015-07-08 | 1 | -3/+15 | |
| | | | | | | | | | | | | Clarified `Client.wait` docs | |||||
* | | | Merge pull request #669 from dano/fix-tty-streams2 | Joffrey F | 2015-07-08 | 4 | -49/+87 | |
|\ \ \ | | | | | | | | | Fix handling output from tty-enabled containers. | |||||
| * | | | Fix handling output from tty-enabled containers. | Dan O'Reilly | 2015-07-06 | 4 | -49/+87 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat output from TTY-enabled containers as raw streams, rather than as multiplexed streams. The docker API docs specify that tty-enabled containers don't multiplex. Also update tests to pass with these changes, and changed the code used to read raw streams to not read line-by-line, and to not skip empty lines. Addresses issue #630 Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | |||||
* | | | Merge pull request #666 from Slix/patch-1 | Maxime Petazzoni | 2015-07-02 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix missing apostrophes in docs | |||||
| * | | | Fix missing apostrophes in docs | Peter Kowalczyk | 2015-07-02 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #652 from docker/clientbase_extraction | Maxime Petazzoni | 2015-07-01 | 2 | -227/+240 | |
|\ \ \ | | | | | | | | | ClientBase extraction | |||||
| * | | | ClientBase class to extract utility methods and constructor and sanitize ↵clientbase_extraction | Joffrey F | 2015-07-01 | 3 | -227/+241 | |
| | | | | | | | | | | | | | | | | Client class | |||||
| * | | | Fix adapter bug + regression test | Joffrey F | 2015-07-01 | 1 | -1/+0 | |
|/ / / | ||||||
* | | | Merge pull request #651 from docker/fix_647 | Joffrey F | 2015-06-30 | 2 | -5/+19 | |
|\ \ \ | | | | | | | | | Fix adapter bug + regression test | |||||
| * | | | Fix Unix socket adapter bug with double slash in path + regression testfix_647 | Joffrey F | 2015-06-30 | 2 | -5/+19 | |
| | | | | ||||||
* | | | | Merge pull request #644 from docker/memory-memswap-hostconfig | Joffrey F | 2015-06-30 | 3 | -63/+91 | |
|\ \ \ \ | |/ / / |/| | | | memory / memswap in hostconfig | |||||
| * | | | Updated tests for mem_limit changesmemory-memswap-hostconfig | Joffrey F | 2015-06-19 | 1 | -53/+56 | |
| | | | | ||||||
| * | | | Moved mem_limit and memswap_limit to host_config for API version >= 1.19 | Joffrey F | 2015-06-19 | 2 | -10/+35 | |
| | | | | ||||||
* | | | | Merge pull request #661 from docker/fix_640 | Maxime Petazzoni | 2015-06-30 | 1 | -1/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | Added git@ as a valid prefix for remote build paths | |||||
| * | | | Added git@ as a valid prefix for remote build pathsfix_640 | Joffrey F | 2015-06-30 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #654 from Melraidin/master | Joffrey F | 2015-06-29 | 1 | -12/+44 | |
|\ \ \ \ | |/ / / |/| | | | Prefer new Docker config location and format. | |||||
| * | | | Prefer new Docker config location and format. | Kevin Martin | 2015-06-28 | 1 | -12/+44 | |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | This tries to load Docker authentication info from ~/.docker/config.json before falling back to its legacy location and format at ~/.dockercfg. Resolves https://github.com/docker/docker-py/issues/648 |