Commit Graph

3158 Commits

Author SHA1 Message Date
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
Joffrey F 42b712d100 Merge pull request #680 from aanand/fix-timestamp-conversion
Enforce UTC datetimes in arguments to `events()`
2015-07-21 10:45:29 -07:00
Aanand Prasad 75cc50f0ad Default to ~/.docker if DOCKER_CERT_PATH is empty
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-21 16:50:44 +01:00
Paul Bellamy 7de1605e9a Fix integration tests.
Forgot to update them in 33e1a58

Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
2015-07-21 12:07:22 +01:00
Aanand Prasad 2c08ad21dd Merge pull request #674 from estesp/use-docker-host-in-tests
Update all client instances in integration tests to use DOCKER_HOST
2015-07-21 11:09:22 +01:00
Aanand Prasad 657420a4d3 Enforce UTC datetimes in arguments to `events()`
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-21 10:49:27 +01:00
Aanand Prasad 4f2ad70f5f Merge pull request #683 from docker/exec_create_check_dict
Added check_resource decorator to exec_create
2015-07-21 10:48:16 +01:00
Joffrey F b712e97d4a Added check_resource decorator to exec_create 2015-07-20 14:17:06 -07:00
Joffrey F 4be228653d Make build auth work with API versions < 1.19 too 2015-07-20 14:06:33 -07:00
Joffrey F 7430eb8e65 Merge branch 'fix-build-auth' of https://github.com/moutten/docker-py into moutten-fix-build-auth 2015-07-20 13:56:29 -07:00
Joffrey F 933ee526ba Merge branch 'master' of github.com:docker/docker-py 2015-07-20 13:52:15 -07:00
Joffrey F 90f81ed328 Merge branch 'aanand-remove-registry-ping' 2015-07-20 13:51:08 -07:00
Joffrey F 915be6ad67 Use constant for deprecation message in auth.py 2015-07-20 13:50:49 -07:00
Aanand Prasad 33e1a58b60 Stop pinging registries from the client
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>
2015-07-20 19:50:18 +01:00
Joffrey F 1f5ba4b25d Merge pull request #678 from pdericson/docs
Minor fixes for docs/api.md
2015-07-20 11:28:39 -07:00
Aanand Prasad 4cfb15737d Merge pull request #676 from larsks/feature/notfound-on-404
return NotFound on 404 errors
2015-07-20 11:46:21 +01:00
Peter Ericson 874be5b333 docs/api.md: rework stats params 2015-07-19 02:02:45 -04:00
Peter Ericson bec21cfce1 docs/api.md: singal -> signal 2015-07-19 01:51:58 -04:00
Matt Outten ebcfab0a4c Switch to send full AuthConfig object for build action
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.
2015-07-17 15:48:52 -04:00
Lars Kellogg-Stedman 2e546f7e26 return NotFound on 404 errors
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.
2015-07-17 08:31:54 -04:00
Phil Estes f321eef031 Update all client instances in integration tests to use DOCKER_HOST
In testing Docker master with the latest docker-py release, a few new
tests exist which don't set the base_url, which is not the default unix
socket location when Docker's integration tests are running.

Also, there is no guarantee syslog can be reached from a test container
so I wrapped that test with the NOT_ON_HOST skip logic.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-07-14 13:00:35 -04:00
Joffrey F 946eb964ad Merge branch 'a-ba-fix-premature-eof' 2015-07-09 11:13:09 -07:00
Joffrey F 96a5b29a4a Merge branch 'fix-premature-eof' of https://github.com/a-ba/docker-py into a-ba-fix-premature-eof
Conflicts:
	docker/client.py
2015-07-09 11:12:01 -07:00
Joffrey F c846d7e1b5 Back to dev version 2015-07-09 11:09:48 -07:00
Joffrey F 07ca4f5725 Merge pull request #671 from docker/1.3.0-release
1.3.0 release
2015-07-09 10:52:07 -07:00
Joffrey F b60d57b67b websocket-client for all versions 2015-07-08 15:18:04 -07:00
Joffrey F aa20f40fcd Updated changelog 2015-07-08 15:08:43 -07:00
Joffrey F 7d85f68460 Bumped version to 1.3.0 2015-07-08 15:08:35 -07:00
Joffrey F 826c9e676a Removed execute() method 2015-07-08 15:08:13 -07:00
Joffrey F 69ef9e5668 Added missing `Client.load_image` docs
Clarified `Client.wait` docs
2015-07-08 13:38:41 -07:00
Joffrey F 28d0840cac Merge pull request #669 from dano/fix-tty-streams2
Fix handling output from tty-enabled containers.
2015-07-08 13:30:59 -07:00