docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,134 Commits 23 Branches 129 Tags 9.3 MiB
Commit Graph

1134 Commits

Author SHA1 Message Date
Aanand Prasad 36424ca001 Stop catching Exception in tests where it isn't expected 
The test runner will report on the exception anyway, so it's redundant.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-25 16:00:42 +01:00
Aanand Prasad d9a149f327 Merge pull request #732 from docker/version-dependent-hostconfig 
Version dependent hostconfig
 2015-08-25 14:03:51 +01:00
Maxime Petazzoni 4d2c15fad1 Merge pull request #733 from ColinHuang/doc 
Add resize API in doc
 2015-08-25 14:53:40 +02:00
Maxime Petazzoni 747c1ca290 Merge pull request #734 from ColinHuang/master 
Split the entrypoint string to shell-like syntax.
 2015-08-25 14:53:17 +02:00
Colin Huang edebf3756a Split the entrypoint string to shell-like syntax. 2015-08-25 09:44:47 +08:00
Colin Huang 1cb8894024 Add resize API in doc 2015-08-25 09:40:21 +08:00
Joffrey F 75e3b8bb71 Update HostConfig docs 2015-08-24 16:28:26 -07:00
Joffrey F 595965ebc4 Adapt tests to new create_host_config usage 2015-08-24 16:25:18 -07:00
Joffrey F 4bd3c48ea1 Add version param to utils.create_host_config 
Add create_host_config and create_container_config to Client for version
awareness
Trigger warning when create_host_config is used without version
 2015-08-24 16:22:59 -07:00
Joffrey F 9bb6a6fd56 Merge branch 'mohitsoni-master' 2015-08-24 14:43:36 -07:00
Mohit Soni 3caaa0050b Added support for cgroup parent 
Clean up cgroup_parent usage
 2015-08-24 14:43:05 -07:00
Joffrey F 4008cbce71 Merge pull request #711 from ClusterHQ/exec_inspect_version 
Change minimum API version for exec_inspect
 2015-08-24 14:19:20 -07:00
Joffrey F cfb20f8d50 Merge pull request #728 from aanand/debug-auth 
Add logging for auth loading/resolution
 2015-08-24 14:03:14 -07:00
Joffrey F 8ba85ac26f Merge pull request #727 from mark-adams/fixes-726 
Fixed #726 issue where split_port was checking `len(None)`
 2015-08-20 10:56:54 -07:00
Aanand Prasad b5368ad8b9 Add logging for auth loading/resolution 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-20 16:57:40 +01:00
Mark Adams b7aa1d76eb Fixed #726 issue where split_port was checking `len(None)` 
- 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
 2015-08-19 22:01:44 -05:00
Joffrey F a6064e356e Merge pull request #724 from bedwards/bedwards-fluentd-patch 
Update types.py to support fluentd logging driver
 2015-08-18 12:33:13 -07:00
Brian Edwards c135266233 add gelf and fluentd logging drivers to types.py 2015-08-18 14:26:32 -05:00
Aanand Prasad 3cd66b66ba Merge pull request #719 from docker/allow-path-in-host 
Allow docker host (base_url) to contain a path
 2015-08-18 11:16:09 +01:00
Joffrey F adb2d01861 Added full path parse_host unit test 2015-08-17 14:45:35 -07:00
Joffrey F 570693c810 Allow docker host (base_url) to contain a path 2015-08-17 14:36:19 -07:00
Bridget McErlean 7ba83323b6 Update error message to state that exec_inspect is not supported 2015-08-12 23:24:52 +01:00
Bridget McErlean eb29b424b0 Change minimum API version for exec_inspect 2015-08-12 11:53:34 +01:00
Joffrey F 139850f3f3 Merge pull request #698 from docker/jhowardmsft-14530-netmode 
`network_mode` now necessary in `host_config`
 2015-08-10 10:53:57 -07:00
Joffrey F 1eaf221391 Explicited start config tricks 2015-08-10 10:45:26 -07:00
Maxime Petazzoni 4b33a43a2f Merge pull request #702 from tshauck/bump-six-reqs 
bump six req to >=1.4
 2015-08-05 08:50:37 -07:00
Aanand Prasad eff21658b3 Merge pull request #703 from erikced/journald-log-driver 
Add journald log driver support
 2015-08-05 10:25:35 +01:00
Joffrey F b0aa08c5b7 Merge branch 'vpetersson-master' 2015-08-04 11:31:59 -07:00
Joffrey F 20a7e860b4 unpack key-value pair 2015-08-04 11:31:18 -07:00
Joffrey F 69027f040c dev version 2015-08-04 11:27:36 -07:00
Joffrey F 05ecc81578 Merge pull request #700 from saeta/patch-1 
Add documentation for mem_limit and memswap_limit
 2015-08-04 09:53:59 -07:00
Erik Cederberg 85bdc9c2bd Add journald log driver support 
Signed-off-by: Erik Cederberg <erikced@gmail.com>
 2015-08-03 19:04:55 +02:00
Trent Hauck 275b45ddef bump six req to >=1.4 2015-08-02 10:53:58 -07:00
Brennan Saeta 5803896e7c Add documentation for mem_limit and memswap_limit 
`create_host_config` has 2 additional parameters that were previously undocumented.
 2015-08-01 12:35:38 -07:00
Viktor Petersson d400717ff8 Squashed commit of the following: 
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.
 2015-07-30 14:39:37 +01:00
Joffrey F 2b7c31e0f7 Fixed empty_host_config test 2015-07-29 14:23:10 -07:00
Joffrey F e32726e83d Moved network_mode default to create_host_config ; small fix to preserve blank host_config in start if no option is provided 2015-07-29 12:45:15 -07:00
Joffrey F daea185a23 nit: parenthesis alignment 2015-07-29 12:43:39 -07:00
Joffrey F 80a97cf2ea development version suffix 2015-07-29 12:40:54 -07:00
Joffrey F be4ea03809 Merge branch '14530-netmode' of https://github.com/jhowardmsft/docker-py into jhowardmsft-14530-netmode 2015-07-29 12:30:53 -07:00
Joffrey F 07a99ea5c7 Merge pull request #696 from alexwlchan/master 
Fix a few typos in the docs
 2015-07-29 12:28:20 -07:00
Alex Chan 78ccfc88e8 Fix a few typos in the docs 
Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
 2015-07-29 14:00:18 +01:00
John Howard 8f1a82faeb Add netmode (required by docker) 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-28 15:18:12 -07:00
Aanand Prasad 70dd654842 Merge pull request #688 from docker/1.3.1-release 
1.3.1 release
 2015-07-22 22:20:30 +01:00
Joffrey F 5f0f085fc7 Updated Makefile to help with release testing 2015-07-22 11:34:36 -07:00
Joffrey F 81f65e924e Added py3-based dockerfile 2015-07-22 11:34:16 -07:00
Joffrey F 57b86fefe5 Updated changelog for 1.3.1 2015-07-22 11:23:51 -07:00
Joffrey F 89c048dc17 Bumped version 2015-07-22 11:23:39 -07:00
Joffrey F f8ad2dabf2 Merge pull request #682 from docker/moutten-fix-build-auth 
Switch to send full AuthConfig object for build action
 2015-07-22 11:11:21 -07:00
Joffrey F 8a87001d09 Merge pull request #685 from paulbellamy/master 
Fix integration tests
 2015-07-21 11:01:11 -07:00