summaryrefslogtreecommitdiff
path: root/docker
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Allow docker host (base_url) to contain a pathJoffrey F2015-08-171-2/+7
|/ / /
* | | Merge pull request #698 from docker/jhowardmsft-14530-netmodeJoffrey F2015-08-102-10/+14
|\ \ \ | | | | | | | | `network_mode` now necessary in `host_config`
| * | | Explicited start config tricksjhowardmsft-14530-netmodeJoffrey F2015-08-101-11/+13
| | | |
| * | | Moved network_mode default to create_host_config ; small fix to preserve ↵Joffrey F2015-07-292-11/+3
| | | | | | | | | | | | | | | | blank host_config in start if no option is provided
| * | | development version suffixJoffrey F2015-07-291-1/+1
| | | |
| * | | Merge branch '14530-netmode' of https://github.com/jhowardmsft/docker-py ↵Joffrey F2015-07-291-0/+10
| |\ \ \ | | | | | | | | | | | | | | | into jhowardmsft-14530-netmode
| | * | | Add netmode (required by docker)John Howard2015-07-281-0/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | | | | Merge pull request #703 from erikced/journald-log-driverAanand Prasad2015-08-051-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Add journald log driver support
| * | | | | Add journald log driver supportErik Cederberg2015-08-031-1/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Erik Cederberg <erikced@gmail.com>
* | | | | unpack key-value pairJoffrey F2015-08-041-2/+1
| | | | |
* | | | | dev versionJoffrey F2015-08-041-1/+1
| | | | |
* | | | | Squashed commit of the following:Viktor Petersson2015-07-302-1/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4f053a06c1e9e3f63fd5afde60322f676acbdf45 Merge: 9177380 07a99ea Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 14:37:16 2015 +0100 Merge branch 'master' into fixes commit 9177380ae9abf4ca01cf7a2a8b7de6640ed5f5d5 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 14:00:51 2015 +0100 Tweaks exception message. commit 6a5832e2f6655835a6b87897d7ec82d6ef5faa50 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 13:17:32 2015 +0100 Simplifies logic as per feedback. commit f750eddc34e5356dcfb53c16a7f98a99e817fa53 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 11:09:14 2015 +0100 Move return from list to dict. Adds exception handling. commit 8e50f57cceb6370b7f7b41624f50d5a6835301a0 Author: Viktor Petersson <vpetersson@wireload.net> Date: Thu Jul 30 10:15:58 2015 +0100 Reverts change to .gitignore. commit 5ba2c1b29706ddb74bef9c24c2a6e64bb369db22 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 21:15:21 2015 +0100 Fixes feedback. Adds three unittests. commit e1c719e61993fdaec0f22ba0de706af80587dc16 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 17:00:16 2015 +0100 WIP Adds test for parse_env_file commit 4448ae72e55d889d9d194a2c0303d182cb157d4c Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 16:42:49 2015 +0100 Excludes coverage files. commit 19a5d01615dd9b7ee939f54f256e5bae89a94ee1 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 16:42:42 2015 +0100 Switch fixes logic. commit a8094c63a9f4351ae71393ea5603aa11c5c5bc94 Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:45:56 2015 +0100 Implements logic for envfile parsing from Docker-cli Ref: https://github.com/docker/docker/blob/master/opts/envfile.go#L19-L51 commit ea9bfd95dfafe4023c58ab37f990158f73eb2e0d Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:41:23 2015 +0100 Replaces CSV module with manual splitting. commit a001d28ff48309d2b2338aaf27253fdfaa0f6c4b Author: Viktor Petersson <vpetersson@wireload.net> Date: Wed Jul 29 11:35:37 2015 +0100 Removes isinstance on filename. commit 419d5961f6103df9166be3a9baa549276c12223d Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 22:39:33 2015 +0100 Reflects @aanand's feedback. commit e81e3c8ed797ff939843d2485bf15525e85e890d Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 15:43:32 2015 +0100 Typo fix. commit 2898389cada2bfca64bdfa71359aebeb3b5b6d1b Author: Viktor Petersson <vpetersson@wireload.net> Date: Tue Jul 28 15:41:08 2015 +0100 Refs #565. Adds minimal implementation of env_file client-side support.
* | | | Bumped versionJoffrey F2015-07-221-1/+1
|/ / /
* | | Merge pull request #682 from docker/moutten-fix-build-authJoffrey F2015-07-222-9/+8
|\ \ \ | | | | | | | | Switch to send full AuthConfig object for build action
| * | | Make build auth work with API versions < 1.19 toomoutten-fix-build-authJoffrey F2015-07-201-3/+8
| | | |
| * | | Merge branch 'fix-build-auth' of https://github.com/moutten/docker-py into ↵Joffrey F2015-07-202-7/+1
| |\ \ \ | | | | | | | | | | | | | | | moutten-fix-build-auth
| | * | | Switch to send full AuthConfig object for build actionMatt Outten2015-07-172-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 #680 from aanand/fix-timestamp-conversionJoffrey F2015-07-211-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | Enforce UTC datetimes in arguments to `events()`
| * | | | Enforce UTC datetimes in arguments to `events()`Aanand Prasad2015-07-211-3/+3
| | |/ / | |/| | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | | Added check_resource decorator to exec_createexec_create_check_dictJoffrey F2015-07-201-0/+1
| |/ / |/| |
* | | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-07-202-0/+6
|\ \ \
| * | | return NotFound on 404 errorsLars Kellogg-Stedman2015-07-172-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.
* | | Use constant for deprecation message in auth.pyJoffrey F2015-07-202-6/+8
| | |
* | | Stop pinging registries from the clientAanand Prasad2015-07-205-24/+45
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'fix-premature-eof' of https://github.com/a-ba/docker-py into ↵Joffrey F2015-07-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | a-ba-fix-premature-eof Conflicts: docker/client.py
| * | fix premature EOF detection in streamsAnthony Baire2015-06-291-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 versionJoffrey F2015-07-091-1/+1
| | |
* | | Bumped version to 1.3.0Joffrey F2015-07-081-1/+1
| | |
* | | Removed execute() methodJoffrey F2015-07-081-13/+0
| | |
* | | Fix handling output from tty-enabled containers.Dan O'Reilly2015-07-062-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | ClientBase class to extract utility methods and constructor and sanitize ↵clientbase_extractionJoffrey F2015-07-012-227/+240
| | | | | | | | | | | | Client class
* | | Merge pull request #651 from docker/fix_647Joffrey F2015-06-301-3/+12
|\ \ \ | | | | | | | | Fix adapter bug + regression test
| * | | Fix Unix socket adapter bug with double slash in path + regression testfix_647Joffrey F2015-06-301-3/+12
| | | |
* | | | Merge pull request #644 from docker/memory-memswap-hostconfigJoffrey F2015-06-302-10/+35
|\ \ \ \ | |/ / / |/| | | memory / memswap in hostconfig
| * | | Moved mem_limit and memswap_limit to host_config for API version >= 1.19Joffrey F2015-06-192-10/+35
| | | |
* | | | Merge pull request #661 from docker/fix_640Maxime Petazzoni2015-06-301-1/+1
|\ \ \ \ | |_|_|/ |/| | | Added git@ as a valid prefix for remote build paths
| * | | Added git@ as a valid prefix for remote build pathsfix_640Joffrey F2015-06-301-1/+1
| | | |
* | | | Merge pull request #654 from Melraidin/masterJoffrey F2015-06-291-12/+44
|\ \ \ \ | |/ / / |/| | | Prefer new Docker config location and format.
| * | | Prefer new Docker config location and format.Kevin Martin2015-06-281-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
* | | Fix small decorator issueJoffrey F2015-06-301-2/+2
| | |
* | | CleanupJoffrey F2015-06-301-3/+2
| | |
* | | Merge branch 'id-resolution-in-check-resource' of ↵Joffrey F2015-06-302-51/+2
|\ \ \ | |/ / |/| | | | | https://github.com/posita/docker-py into posita-id-resolution-in-check-resource
| * | Move image/container ID resolution to @check_resource decorator.Matt Bogosian2015-05-202-51/+2
| | |
* | | Fix stop timeout bugfix_649Joffrey F2015-06-241-1/+1
| | |
* | | Updated websocket-client dependency to latest version (now supports python 3)Joffrey F2015-06-191-7/+2
| | |
* | | Support 401 status for v2 registry endpointJoffrey F2015-06-191-3/+6
| | |
* | | Merge branch 'master' of https://github.com/cesanta/docker-py into ↵Joffrey F2015-06-191-1/+3
|\ \ \ | |_|/ |/| | | | | cesanta-master
| * | Fix pinging an unauthenticated v2 registryMarko Mikulicic2015-05-291-1/+3
| | |
* | | Merge branch 'pullfix' of https://github.com/glogiotatidis/docker-py into ↵Joffrey F2015-06-191-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | glogiotatidis-pullfix Conflicts: docker/client.py
| * | | Fix pull parameter for docker server version < 1.7.Giorgos Logiotatidis2015-06-011-0/+6
| | | |
View Lorry Controller Status