summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Integration tests: create_host_config fixesversion-dependent-hostconfigJoffrey F2015-08-251-12/+12
|
* Update HostConfig docsJoffrey F2015-08-242-4/+5
|
* Adapt tests to new create_host_config usageJoffrey F2015-08-242-49/+63
|
* Add version param to utils.create_host_configJoffrey F2015-08-242-5/+22
| | | | | | Add create_host_config and create_container_config to Client for version awareness Trigger warning when create_host_config is used without version
* Merge branch 'mohitsoni-master'Joffrey F2015-08-242-1/+22
|\
| * Added support for cgroup parentMohit Soni2015-08-242-1/+22
|/ | | | Clean up cgroup_parent usage
* Merge pull request #711 from ClusterHQ/exec_inspect_versionJoffrey F2015-08-241-2/+4
|\ | | | | Change minimum API version for exec_inspect
| * Update error message to state that exec_inspect is not supportedBridget McErlean2015-08-121-1/+3
| |
| * Change minimum API version for exec_inspectBridget McErlean2015-08-121-2/+2
| |
* | Merge pull request #728 from aanand/debug-authJoffrey F2015-08-242-6/+49
|\ \ | | | | | | Add logging for auth loading/resolution
| * | Add logging for auth loading/resolutionAanand Prasad2015-08-202-6/+49
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | | Merge pull request #727 from mark-adams/fixes-726Joffrey F2015-08-202-6/+22
|\ \ \ | |/ / |/| | Fixed #726 issue where split_port was checking `len(None)`
| * | Fixed #726 issue where split_port was checking `len(None)`Mark Adams2015-08-192-6/+22
|/ / | | | | | | | | | | - Fixed #726 by adding a check for None in split_port - Also switched to using a _raise_invalid_port() function to replace multiple slightly differing ValueErrors for invalid port
* | Merge pull request #724 from bedwards/bedwards-fluentd-patchJoffrey F2015-08-181-1/+3
|\ \ | | | | | | Update types.py to support fluentd logging driver
| * | add gelf and fluentd logging drivers to types.pyBrian Edwards2015-08-181-1/+3
|/ /
* | Merge pull request #719 from docker/allow-path-in-hostAanand Prasad2015-08-182-3/+11
|\ \ | |/ |/| Allow docker host (base_url) to contain a path
| * Added full path parse_host unit testallow-path-in-hostJoffrey F2015-08-171-1/+4
| |
| * 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-104-21/+39
|\ | | | | `network_mode` now necessary in `host_config`
| * Explicited start config tricksjhowardmsft-14530-netmodeJoffrey F2015-08-101-11/+13
| |
| * Fixed empty_host_config testJoffrey F2015-07-291-1/+1
| |
| * 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
| * nit: parenthesis alignmentJoffrey F2015-07-291-6/+12
| |
| * development version suffixJoffrey F2015-07-291-1/+1
| |
| * Merge branch '14530-netmode' of https://github.com/jhowardmsft/docker-py ↵Joffrey F2015-07-292-10/+28
| |\ | | | | | | | | | into jhowardmsft-14530-netmode
| | * Add netmode (required by docker)John Howard2015-07-282-10/+28
| | | | | | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | | Merge pull request #702 from tshauck/bump-six-reqsMaxime Petazzoni2015-08-052-2/+2
|\ \ \ | | | | | | | | bump six req to >=1.4
| * | | bump six req to >=1.4Trent Hauck2015-08-022-2/+2
| |/ /
* | | 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>
* | | Merge branch 'vpetersson-master'Joffrey F2015-08-045-3/+84
|\ \ \
| * | | unpack key-value pairJoffrey F2015-08-041-2/+1
| | | |
| * | | dev versionJoffrey F2015-08-041-1/+1
| | | |
| * | | Squashed commit of the following:Viktor Petersson2015-07-304-2/+84
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #700 from saeta/patch-1Joffrey F2015-08-041-0/+2
|\ \ \ | |/ / |/| | Add documentation for mem_limit and memswap_limit
| * | Add documentation for mem_limit and memswap_limitBrennan Saeta2015-08-011-0/+2
|/ / | | | | `create_host_config` has 2 additional parameters that were previously undocumented.
* | Merge pull request #696 from alexwlchan/masterJoffrey F2015-07-292-5/+5
|\ \ | | | | | | Fix a few typos in the docs
| * | Fix a few typos in the docsAlex Chan2015-07-292-5/+5
|/ / | | | | | | Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
* | Merge pull request #688 from docker/1.3.1-release1.3.1Aanand Prasad2015-07-225-4/+41
|\ \ | |/ |/| 1.3.1 release
| * Updated Makefile to help with release testing1.3.1-releaseJoffrey F2015-07-221-2/+11
| |
| * Added py3-based dockerfileJoffrey F2015-07-222-1/+7
| |
| * Updated changelog for 1.3.1Joffrey F2015-07-221-0/+22
| |
| * 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 #685 from paulbellamy/masterJoffrey F2015-07-211-2/+2
|\ \ \ | | | | | | | | Fix integration tests
| * | | Fix integration tests.Paul Bellamy2015-07-211-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-conversionJoffrey F2015-07-213-6/+6
|\ \ \ \ | |/ / / |/| | | Enforce UTC datetimes in arguments to `events()`
View Lorry Controller Status