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

471 Commits

Author SHA1 Message Date
Joffrey F bd46ba5757 Don't allow 'version' param in AutoVersionClient ctor 2015-03-05 12:08:16 -08:00
Joffrey F 2ec104792b Streamline exceptions for auto version ; retrieve_server_version into protected method 2015-03-05 11:52:47 -08:00
Tomas Tomecek 3e0496cc16 detect server version when version="auto" 
heavily inspired by PR#281

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2015-03-05 08:53:29 +01:00
Joffrey F 55571308e8 Merge branch 'master' of github.com:docker/docker-py 2015-03-04 13:38:05 -08:00
Joffrey F dc210b865e Only call decode if Python 3.x 2015-03-04 13:37:34 -08:00
Joffrey F 7e600a3fe7 Merge branch 'py3-json' of https://github.com/ssanderson/docker-py into ssanderson-py3-json 2015-03-04 13:35:35 -08:00
dlorenc c4cb509277 Handle passwords with ':' characters. 
Signed-off-by: dlorenc <lorenc.d@gmail.com>
 2015-03-03 14:51:35 -08:00
Joffrey F 39ee5981b4 Merge pull request #502 from cpuguy83/498_dockerignore_special_names 
Add special cases for .dockerignore
 2015-02-27 11:56:19 -08:00
Joffrey F 86390888d8 shorter convert_to_hostname 2015-02-27 11:44:53 -08:00
Aanand Prasad b1a858a14d Update resolve_authconfig to bring it in line with Docker client 
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>
 2015-02-27 13:10:20 +00:00
Brian Goff ce40730b42 Add special cases for .dockerignore 
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>
 2015-02-24 15:48:51 -05:00
Scott Sanderson bf97ebb2ed BUG: Fix errors in Python 3 from JSON-decoding bytes. 2015-02-24 11:23:00 -05:00
Daniel Nephin 0713488fac Resolves #497 - add support for dockerfile 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-02-20 21:20:21 -05:00
Joffrey F 5dace1114d Back to dev version 2015-02-16 18:38:29 -08:00
Joffrey F 2c60e67ddc Bumped version to 1.0.0 2015-02-12 16:14:17 -08:00
Joffrey F 21bcf7723f Added api_version property 2015-02-12 15:36:50 -08:00
Joffrey F 81056e7c5f Remove unused code 2015-02-12 15:31:30 -08:00
Christophe Labouisse 26e74c8cc4 Add decode parameter to be able to the the stats as a dictionary 2015-02-12 22:27:02 +01:00
Joffrey F 1a7e3a2d6d Merge branch 'add-stats-api-support' of https://github.com/nir0s/docker-py into nir0s-add-stats-api-support 2015-02-12 13:15:59 -08:00
nir0s 0379bddeaa added version compliable check 2015-02-12 09:57:46 +02:00
nir0s 52702f7da0 removed aggregation for now and added a unit test. also using stream_helper now 2015-02-12 09:48:33 +02:00
Joffrey F 59d52604b1 Merge pull request #488 from docker/memoryswap 
Container config cleanup
 2015-02-11 14:10:45 -08:00
Joffrey F 5f552fd55b Merge pull request #486 from nir0s/fix-old-style-string-formatting 
Fix old style string formatting
 2015-02-11 14:06:56 -08:00
Joffrey F e2233fcee1 * Moved _container_config to utils.create_container_config 
* memswap_limit can now be provided as a string, similar to mem_limit
 2015-02-11 14:02:21 -08:00
nir0s dd1a6fc906 fixed string formatting in errors 2015-02-11 22:27:53 +02:00
nir0s ea2148ade1 fixes 2015-02-11 22:26:23 +02:00
nir0s 53b5ed2178 fixed string formatting in utils 2015-02-11 22:24:06 +02:00
Joffrey F af492c3057 Added support for pid_mode param 2015-02-11 12:15:39 -08:00
nir0s f402af551d added initial support for stats retrieval 2015-02-11 22:04:32 +02:00
Joffrey F 22dd8d78ea Merge pull request #480 from ggtools/events 
Add missing options to the events command
 2015-02-11 11:13:52 -08:00
Christophe Labouisse ea28ebb5f1 Add a `decode` parameter to the events command 
This will ensure compatibility with the previous versions of
docker-py.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-02-11 07:27:30 +01:00
Christophe Labouisse 9bd71b2d45 Add decoding to the events 
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-02-11 07:27:23 +01:00
Christophe Labouisse 2bd21ad066 Fix flake8 issues 
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-02-11 07:27:23 +01:00
Christophe Labouisse 53b1bb41ac Fix datetime issue with Python 2.6 
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-02-11 07:25:59 +01:00
Christophe Labouisse a07bd28077 Add missing options to the events command 
- Add since, until and filters parameters to `Client.events`
- Add missing `events`command in the documentation

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-02-11 07:25:59 +01:00
Joffrey F e379e8ae24 read_only parameter 2015-02-10 16:13:09 -08:00
Joffrey F d0512028be Merge pull request #482 from docker/rename_container 
New Client.rename() method
 2015-02-10 13:56:29 -08:00
Joffrey F 35c4cbd9c4 Bumped default API version, fixed rename() 2015-02-10 12:55:43 -08:00
Joffrey F 41a94174fd Added rename method 2015-02-10 12:55:28 -08:00
Joffrey F 5cc7cc12ed Merge pull request #474 from gierschv/fix-build-remote 
Fix crash when building from remote sources
 2015-02-10 10:33:47 -08:00
Joffrey F 3e1dded350 Back to dev version 2015-02-10 10:32:27 -08:00
Greg Taylor 168e8c7e18 Rename Client._timeout to timeout. 2015-02-04 20:19:22 -05:00
Vincent Giersch f3717f5815 Fix crash when building from remote sources 
Avoid crashing when the Docker python client is able to load
registry credentials when building using a remote source

Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
 2015-02-04 16:26:55 +00:00
Joffrey F f4d9fac6dc Bumped version 2015-02-01 16:10:33 -08:00
Joffrey F 96950a467d Fix #458 2015-02-01 15:47:23 -08:00
Joffrey F cd006bbfaf Fix #466 2015-02-01 15:44:30 -08:00
Joffrey F 08ce8d0e9f Bumped version back to dev 2015-02-01 15:44:00 -08:00
Joffrey F 40770878ad Additional tests and small improvement to auth.resolve_authconfig 2015-02-01 15:36:56 -08:00
Joffrey F 3d6d5e1012 Merge pull request #441 from dims/fix-log-streams 
Fix to enable streaming container logs reliably
 2015-02-01 14:47:59 -08:00
Joffrey F 648baa6f12 Merge pull request #464 from hibooboo2/add_support_for_mac_address 
Add Support for Mac Address
 2015-02-01 14:19:38 -08:00