Commit Graph

857 Commits

Author SHA1 Message Date
Aanand Prasad bd72bd13c7 Finish labels implementation, add tests and docs
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:42:10 -07:00
Aanand Prasad 014dba2841 Update default API version to 1.18
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 14:49:42 -07:00
André Martins d018e37229 Implemented labels for docker-py
Signed-off-by: André Martins <martins@noironetworks.com>
2015-03-17 18:52:25 +00:00
Joffrey F 01654eee68 Merge pull request #523 from docker/1.1.0-release
1.1.0 release
2015-03-11 11:33:14 -07:00
Joffrey F 15631d352c Bumped version 2015-03-10 17:29:33 -07:00
Joffrey F 5ca2419e23 Updated changelog 2015-03-10 17:29:24 -07:00
Joffrey F 0c8626ebea Fixed TLS docs 2015-03-10 17:14:51 -07:00
Joffrey F dc16b56c4b Merge pull request #520 from kenden/master
Making examples in doc a bit clearer for volumes and ports_binding
2015-03-09 10:34:21 -07:00
kenden 9bf3efb90b adding response container_id to make the example clearer.
Without it, c.start refer to container_id, which has not been introduced before.
2015-03-09 15:44:24 +01:00
kenden 144f11d4e0 adding response container_id to make the example clearer.
Without this, c.start refers to container_id, which has not been introduced before
2015-03-09 15:43:13 +01:00
Joffrey F 6fac5fd47c Merge pull request #519 from TomasTomecek/document-tail-in-logs
docs: document parameter tail of method logs
2015-03-06 12:12:04 -08:00
Tomas Tomecek 05bbafee03 docs: document parameter tail of method logs 2015-03-06 10:06:42 +01:00
Joffrey F 7d5c1efbbe Fix unit tests 2015-03-05 12:16:53 -08:00
Joffrey F 7c4ed86d8d Merge branch 'TomasTomecek-autodetect-api-version' 2015-03-05 12:12:27 -08:00
Joffrey F 6f18b4a86f Mention version='auto' in docs 2015-03-05 12:12:02 -08:00
Joffrey F acfa99dd10 Auto-detect integration tests 2015-03-05 12:08:41 -08:00
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 9bed480c27 Bump requests version 2015-03-04 16:29:44 -08:00
Joffrey F 55571308e8 Merge branch 'master' of github.com:docker/docker-py 2015-03-04 13:38:05 -08:00
Joffrey F a043173676 Merge branch 'ssanderson-py3-json' 2015-03-04 13:37:50 -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
Joffrey F 1aee1df4dd Merge pull request #511 from rmohr/fix-open-files
Properly close files and sockets in unit tests
2015-03-04 13:34:20 -08:00
Joffrey F 134e4b712c Merge pull request #514 from dlorenc/master
Handle passwords with ':' characters.
2015-03-03 15:19:48 -08:00
dlorenc c4cb509277 Handle passwords with ':' characters.
Signed-off-by: dlorenc <lorenc.d@gmail.com>
2015-03-03 14:51:35 -08:00
Roman Mohr a86bfffd89 Properly close files and sockets in unit tests 2015-02-28 21:03:15 +01: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 91985b2397 Merge pull request #509 from docker/lxc_driver_test_compat
Lxc driver test compat
2015-02-27 11:48:36 -08:00
Joffrey F 0fae821350 Merge pull request #508 from docker/de-i11003
Rename test fix to take into account docker/docker#11003
2015-02-27 11:47:57 -08:00
Joffrey F a341aa2d26 Merge branch 'aanand-fix-resolve-authconfig' 2015-02-27 11:45:21 -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
Joffrey F 8d2b71fa7e I suck at python 2015-02-26 17:54:19 -08:00
Joffrey F e255c10f57 Ensure integration tests work with LXC exec driver 2015-02-26 17:39:44 -08:00
Joffrey F 21cc9916fd Rename test fix to take into account docker/docker#11003 2015-02-26 17:16:36 -08: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
Joffrey F 5ce02b9f14 Merge pull request #500 from dnephin/support_build_dockerfile
Add support for dockerfile
2015-02-23 10:14:49 -08: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 d39da11679 Merge pull request #494 from tianon/fix-host-assumptions
Fix several DOCKER_HOST assumptions in integration_test.py
2015-02-16 18:40:29 -08:00
Joffrey F 5dace1114d Back to dev version 2015-02-16 18:38:29 -08:00
Tianon Gravi 7f49cf1279 Fix several DOCKER_HOST assumptions in integration_test.py 2015-02-16 16:42:34 -07:00
Joffrey F 7084802da2 Fix pep8 error 2015-02-16 10:56:08 -08:00
Joffrey F 35b694d678 Merge pull request #493 from docker/1.0.0-release
1.0.0 release
2015-02-16 10:53:06 -08:00
Joffrey F 0f1bd817ac 1.0.0 changelog 2015-02-12 16:14:30 -08:00
Joffrey F 2c60e67ddc Bumped version to 1.0.0 2015-02-12 16:14:17 -08:00
Joffrey F c02f0ab723 Formatting 2015-02-12 15:54:16 -08:00
Joffrey F 21bcf7723f Added api_version property 2015-02-12 15:36:50 -08:00