Commit Graph

328 Commits

Author SHA1 Message Date
Joffrey F 538a1db9dd Merge pull request #1066 from yunzhu-li/blkio-control
Add support for Block IO constraints in HostConfig
2016-06-15 14:26:49 -07:00
Joffrey F 080b4711f2 Merge pull request #1083 from docker/1042-ip-networking-config
Support ipv4_address and ipv6_address in create_endpoint_config
2016-06-13 18:02:58 -07:00
Joffrey F d991db5b45 Expand on the 1-network limit in create_container
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 17:58:10 -07:00
Joffrey F fc4bfde0d6 Unify endpoint config creation when using connect_container_to_network
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 17:58:10 -07:00
Joffrey F b6fa986293 Add ipv[46]_address params to create_endpoint_config.
Update networks documentation with exhaustive API docs

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 17:58:10 -07:00
Joffrey F b050544237 Fix param name for inspect_image in API docs
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-09 13:01:29 -07:00
Adam Chainz 7f255cd295 Convert readthedocs links for their .org -> .io migration for hosted projects
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.

Signed-off-by: Adam Chainz <adam@adamj.eu>
2016-06-08 03:48:04 +01:00
yunzhu-li 896d36ea1d
Add support for Block IO constraints in HostConfig
This adds support for Block IO constraint options:
    - blkio-weight
    - blkio-weight-device
    - device-read-bps
    - device-write-bps
    - device-read-iops
    - device-write-iops

Signed-off-by: yunzhu-li <contact@yunzhu.li>
2016-06-05 23:30:44 -04:00
Thomas Grainger 7e24304934
update docs to py3.5
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
2016-05-19 18:04:46 +01:00
Jonathan Giannuzzi 98b41fee3c Add support for creating internal networks
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
2016-05-18 16:25:43 +02:00
Joffrey F d6e70e2c40 Update ChangeLog and version.py (1.8.1)
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-28 17:15:20 -07:00
Joir-dan Gumbs 1c8ce07785 Added link to docker ps documentation
Signed-off-by: Joir-dan Gumbs <jdagumbs@gmail.com>
2016-04-19 23:19:55 -07:00
Joir-dan Gumbs 923536a168 rebased documentation changes against master fork
Signed-off-by: Joir-dan Gumbs <jdagumbs@gmail.com>
2016-04-18 21:39:55 -07:00
Joffrey F 267bd34426 Bump version to 1.8.0
Add RC bugfixes to the changelog.

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-05 16:21:16 -07:00
Joir-dan Gumbs d6b42c480e Added extra filtering options to containers command in ClientAPI
Signed-off-by: Joir-dan Gumbs <jdagumbs@gmail.com>
Signed-off-by: Joir-dan Gumbs <jgumbs@us.ibm.com>
2016-03-30 22:25:20 -07:00
Aanand Prasad 449e037de3 Improve port binding docs
- Reword a sentence that was wrong ("container" and "host" were the
  wrong way round)

- Put the multiple-ports example before the multiple-IPs example

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-30 11:23:07 +01:00
tomleb 5234784760 Specify default value of stop's timeout
Signed-off-by: Tom Lebreux <tomlebreux@hotmail.com>
2016-03-23 19:37:54 -04:00
Joffrey F 84ed0ae2ef Update ChangeLog
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-23 13:14:34 -07:00
Joffrey F 9505b3e8b5 Merge branch 'master' of https://github.com/dimaspivak/docker-py into dimaspivak-master 2016-03-23 12:04:09 -07:00
Joffrey F 62d6aa59ca Update mkdocs.yml to reference new Machine page.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 17:22:28 -07:00
Joffrey F c3f76e6e8f Merge branch 'from_env' of https://github.com/bfirsh/docker-py into bfirsh-from_env 2016-03-22 17:09:24 -07:00
Aditya Marella 7a0e19766b Support OomScoreAdj in host configuration
Signed-off-by: Aditya Marella <aditya.marella@gmail.com>
2016-03-22 10:54:59 -07:00
Dima Spivak 99b6ec1180 Add support for changes param to ContainerApiMixin.commit
docker commit --changes was added to Docker in 1.6.0.

Signed-off-by: Dima Spivak <dima@spivak.ch>
2016-03-21 11:37:14 -07:00
Aanand Prasad a054509269 Reword tmpfs documentation
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-16 15:07:53 +00:00
Jan Losinski 88ef5f3630 Add documentation for the Tmpfs Hostconfig option.
Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
2016-03-16 14:47:40 +00:00
Ben Firshman 8991ba7cce Add docker.from_env() shortcut
A much neater way of getting started with docker-py.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-03-15 11:24:25 -07:00
Tim Ski d7af8d79a4 Updated stat networks print output Signed-off-by: Tim Marcinowski <marshyski@gmail.com> 2016-03-02 11:34:36 -05:00
Joffrey F 81d8caaf36 Merge pull request #916 from docker/container_update_feature
Support for container limits update
2016-02-24 18:00:06 -08:00
Joffrey F cdf6dc8c3c Merge pull request #942 from seguins/934-separate-stream-follow-logs
Separate params stream and follow for logs.
2016-02-24 16:04:42 -08:00
Joffrey F 6f6d0890a4 Documentation for Client.update_container method
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 16:18:36 -08:00
Joffrey F 287ab93399 Prepare 1.7.2 release
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 15:02:11 -08:00
Joffrey F 498c7d4837 Update changelog for 1.7.1
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-17 11:00:19 -08:00
Stéphane Seguin 71fafd3209 Separate params stream and follow for logs.
Closes #934

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-02-16 18:51:55 +01:00
Spencer Rinehart fca622cad7 Add support for shm_size.
--shm-size was added to Docker in 1.10 via docker/docker#16168.  See
docker/compose#2823 for more details.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-04 12:33:05 -06:00
Joffrey F a11dc87bd3 Bump to stable version
Update ChangeLog

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-04 09:39:02 -08:00
Joffrey F 41d049a11c Advanced documentation for port bindings
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-28 17:55:36 -08:00
Joffrey F f9b04c1026 Improve host devices support
Add unit tests for utils.parse_devices
Rewrite documentation
Support dict and string format for device declaration

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-18 11:38:32 -08:00
Ryan Belgrave 67a29441c4 allow custom ipam options when creating networks
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-04 18:57:11 -05:00
Joffrey F ee0788e4ad Merge pull request #882 from docker/881-hostconfig_doc
Add cpu_quota and cpu_period to the HostConfig documentation
2016-01-04 14:52:23 -08:00
Josh Purvis d388abe3b3 Add docs for argument when retrieving container logs
Signed-off-by: Josh Purvis <jpurvis@kwantera.com>
2015-12-23 11:41:59 -05:00
Joffrey F 7724e36e1b Add cpu_quota and cpu_period to the HostConfig documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-12-22 17:43:03 -08:00
Sumit Sahrawat 64fdde5ef9 Fix #869: Add docs for network api
Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
2015-12-10 10:29:11 +05:30
Sumit Sahrawat 2981d013a5 Fix remove_volume return value
Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
2015-12-10 10:29:11 +05:30
Jonathan Stewmon 31b1b53f7f added stop_signal to create container config
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
2015-12-03 14:31:51 -06:00
Daniel Nephin 95ea5afdb1 Merge pull request #864 from ticosax/document-network_mode
[doc] network_mode can also take the name of a network as value.
2015-12-01 11:11:38 -08:00
Nicolas Delaby 497442169c network_mode can also take the name of a network as value.
Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
2015-12-01 10:27:30 +01:00
Joffrey F a0c0972267 Update Changelog with one last bugfix
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-30 12:22:01 -08:00
Joffrey F aec48133a8 Update Changelog
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-23 15:30:14 -08:00
Joffrey F dfcc1d87bf Merge branch 'oom-kill-disable-pr' of https://github.com/schu/docker-py into schu-oom-kill-disable-pr 2015-11-18 14:35:54 -08:00
Daniel Nephin 0284eadaff Merge pull request #805 from sourcelair/enhancement/stats-no-stream
Add support for non-stream stats of containers
2015-11-17 10:47:28 -05:00
Daniel Nephin 4e441b2a6b Merge pull request #834 from lots0logs/814-host-config-mem-swap
Add support for MemorySwappiness to client.create_host_config()
2015-11-16 11:37:15 -05:00
Michael Schubert 8924319631 create_host_config: allow setting oom_kill_disable
Signed-off-by: Michael Schubert <schu@schu.io>
2015-11-10 11:08:24 +01:00
Dustin Falgout 64fc383f2c Update hostconfig.md
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-11-09 02:41:15 -06:00
Viacheslav Boiko 3330569772
Merge upstream branch 'master' into feature/logs_since
Signed-off-by: Viacheslav Boiko <v.e.boyko@gmail.com>
2015-11-05 11:56:06 +01:00
Dustin Falgout c07dd53a2a Incorporates feedback from and closes #814
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-11-05 02:20:53 -06:00
Antonis Kalipetis 019a365a02 Enhance docs for stats method
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2015-10-22 10:23:53 +00:00
Alasdair Nicol 0c2aaac3d5 Tidied up code examples in docs
* Use `cli = Client` everywhere
 * Use Client.create_host_config method
 * Added missing '>'s

Signed-off-by: Alasdair Nicol <alasdair@thenicols.net>
2015-10-14 22:53:21 +01:00
Joffrey F 5d95f24264 Add devices param to the hostconfig documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-08 17:28:43 -07:00
Joffrey F c887147d31 Update changelog and bump version to 1.5.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-08 14:58:54 -07:00
Joffrey F f479720d51 Merge branch 'archive_endpoint' 2015-10-08 14:00:07 -07:00
Joffrey F 4845dae0c0 put/get archive implementation
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-08 13:59:39 -07:00
Joffrey F 28627a3af8 Docs: Remove float from valid cpu_shares types
Fixes #775

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-08 12:22:22 -07:00
Viacheslav Boiko 4a2db828b4 Support the 'since' option in the 'containers/<id>/logs' endpoint
Signed-off-by: Viacheslav Boiko <v.e.boyko@gmail.com>
2015-10-02 06:19:06 +00:00
Pierre Fersing 2d4a71df2e Allow to specify ps_args when listing processes
Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
2015-09-25 16:58:27 +02:00
Joffrey F 4475310eea Merge pull request #777 from rutsky/patch-2
specify default value of stream parameter of exec_start()
2015-09-22 15:02:24 -07:00
Joffrey F dd36fae131 Merge pull request #772 from rutsky/patch-1
add missing dots at ends of command descriptions
2015-09-18 17:12:52 -07:00
Vladimir Rutsky 46dd94d1f3 fix network_mode 'none' value
Signed-off-by: Vladimir Rutsky <vladimir@rutsky.org>
2015-09-18 02:58:04 +03:00
Vladimir Rutsky 74a3242b80 specify default value of stream parameter of exec_start()
Signed-off-by: Vladimir Rutsky <vladimir@rutsky.org>
2015-09-18 02:20:09 +03:00
Joffrey F ea9e13ff2b Detail which exception is thrown by remove_volume
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-16 12:55:49 -07:00
Joffrey F ba6df5a2c0 Add documentation for volume API methods
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-16 12:55:12 -07:00
Vladimir Rutsky 34784db43f add missing dots at ends of command descriptions
Signed-off-by: Vladimir Rutsky <vladimir@rutsky.org>
2015-09-16 03:27:33 +03:00
Joffrey F 0610efbce0 Support group_add param in host config
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-15 01:11:11 +02:00
Joffrey F 9372ef27f8 Updated changelog
Bumped version to 1.4.0

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-10 11:07:35 -07:00
Joffrey F 0ef8c0459d Add missing ipc_mode documentation 2015-09-09 10:47:51 -07:00
Joffrey F db1a93fd27 Merge pull request #662 from stevenewey/exec_create_user
Exec create user
2015-08-26 15:36:47 -07:00
Aanand Prasad d9a149f327 Merge pull request #732 from docker/version-dependent-hostconfig
Version dependent hostconfig
2015-08-25 14:03:51 +01: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
Stephen Newey 1c1d7eee5a Merge branch 'master' into exec_create_user 2015-08-12 18:12:56 +01:00
Joffrey F b0aa08c5b7 Merge branch 'vpetersson-master' 2015-08-04 11:31:59 -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
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
Joffrey F 57b86fefe5 Updated changelog for 1.3.1 2015-07-22 11:23:51 -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 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
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
Joffrey F aa20f40fcd Updated changelog 2015-07-08 15:08:43 -07:00
Joffrey F 69ef9e5668 Added missing `Client.load_image` docs
Clarified `Client.wait` docs
2015-07-08 13:38:41 -07:00
Peter Kowalczyk 3bc9f52d9d Fix missing apostrophes in docs 2015-07-02 10:42:08 -05:00
Stephen Newey a12818a8a8 Add user argument to exec_create documentation. 2015-06-30 13:41:22 +01:00
Joffrey F e05d06bcf2 Merge branch 'allow-any-mode' of https://github.com/aanand/docker-py into aanand-allow-any-mode 2015-06-18 21:10:13 +02:00
Joffrey F b78397d233 Merge pull request #633 from edmorley/update-b2d-shellinit-example
Docs: Update boot2docker shellinit example to use 'eval'
2015-06-18 11:54:16 -07:00
Joffrey F 38a6651ede small doc fixes 2015-06-18 20:38:52 +02:00
Philipp Möller 3a32be79d3 Add and document a decode parameter for build
This makes the build method consistent with the events method and adds
some convenience.
2015-06-18 20:38:21 +02:00
Luke Marsden 5fa7576e8c Add volume_driver param to client.create_container
- Add appropriate test which also asserts that volume names can be passed through to drivers.
- Add new param to docs.

Signed-off-by: Luke Marsden <luke@clusterhq.com>
2015-06-18 20:38:21 +02:00
Joffrey F 6f343aa8ea Release 1.2.3 2015-06-18 19:50:31 +02:00
Joffrey F f0a9c80a49 Updated ChangeLog for 1.2.3 2015-06-16 14:44:39 -07:00
Joffrey F 6e3dba99b7 Merge branch 'aanand-allow-binds-list' into 1.3.0-rc0 2015-06-12 11:29:56 -07:00
Aanand Prasad 1446b8c5ee Allow binds to be specified as a list of strings
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-12 12:36:59 -04:00
Ed Morley 9a5b7b2959 Docs: Update boot2docker shellinit example to use 'eval'
The boot2docker documentation has since changed the recommended way to
use shellinit - see boot2docker/boot2docker#786. The command also no
longer prints the export lines to the console, so have updated the
example output.
2015-06-10 14:32:49 +01:00
Aanand Prasad 7dd7625391 Allow any mode string to be passed into a volume bind
Volume binds now take a "mode" key, whose value can be any string.

"ro" is still supported. It is an error to specify both "ro" and "mode".

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-05 13:25:59 +01:00
Joffrey F cf178ad3b1 Changelog WIP 2015-05-26 16:18:55 -07:00
Philipp Moeller 488e14c560 Remove non-existing argument
There is no container argument in create_container_config. This is probably a leftover when this was copied from the Client.start documentation
2015-05-20 11:29:39 +02:00
Joffrey F 5af442fb9b Removed instances of using host_config in start from docs and examples 2015-05-08 14:24:53 -07:00
Joffrey F c3a48775b6 Added documentation for decode param on stats and events 2015-05-07 13:38:12 -07:00
Joffrey F b8e950c09e Updated changelog 2015-05-04 11:47:16 -07:00
Joffrey F e5ce67e72f Bumped version, changelog 2015-04-28 10:48:09 -07:00
Joffrey F 652e5b8bda Added 'label' to list of filters 2015-04-27 17:41:52 -07:00
Joffrey F 5b9d088e65 Updated ChangeLog 2015-04-27 17:39:21 -07:00
Joffrey F e2fef06bbc Merge pull request #570 from docker/build_limits
Build limits
2015-04-27 16:52:19 -07:00
Joffrey F 8c32677725 container limits documentation 2015-04-27 16:50:00 -07:00
Joffrey F eeb4d4a3a6 Improved filters documentation 2015-04-27 14:39:25 -07:00
Joffrey F e337a2317e Updated exec API documentation 2015-04-27 14:11:43 -07:00
Joffrey F 21d80b16dd Added log_config support in host config 2015-04-24 14:56:06 -07:00
Joffrey F 650abccd7e ulimits: Updated docs 2015-04-22 16:44:40 -07:00
Joffrey F a5519022d9 Merge branch 'sam/import-improvements' of https://github.com/ssssam/docker-py into ssssam-sam/import-improvements
Conflicts:
	docker/client.py
	docker/unixconn/unixconn.py
	tests/integration_test.py
2015-04-22 11:50:45 -07:00
Joffrey F e1a6f2e0ff Small docs clarification 2015-04-22 11:28:59 -07:00
Joffrey F 1445956010 Merge branch 'pull_auth' of https://github.com/hibooboo2/docker-py into hibooboo2-pull_auth 2015-04-22 11:18:46 -07:00
Joffrey F b097d19f2f docs and unit test for security_opt 2015-03-25 15:40:14 -07:00
ynachiket 10f6eafb2b Fixed stats related typo in api.md 2015-03-21 10:37:44 -07:00
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
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
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 6f18b4a86f Mention version='auto' in docs 2015-03-05 12:12:02 -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
James Harris 1685bc4594 Add auth config to pull 2015-02-18 14:36:33 -07:00
Joffrey F 0f1bd817ac 1.0.0 changelog 2015-02-12 16:14:30 -08:00
Joffrey F 1f1e399958 Don't modify changelog yet 2015-02-12 13:16:53 -08: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 893626142c docs fix 2015-02-12 09:58:56 +02:00
nir0s bbc2121951 fixed docs 2015-02-12 09:49:45 +02:00
Joffrey F 6ff362393c Merge pull request #487 from maxamillion/get-image-docs
added docs for get_image
2015-02-11 14:07:17 -08:00
Adam Miller cd0b648137 added docs for get_image 2015-02-11 14:41:12 -06:00
Joffrey F db825d84a8 pid_mode documentation 2015-02-11 12:16:00 -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 9bd71b2d45 Add decoding to the events
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-02-11 07:27:23 +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 a7f7fbb0fd rename() tests and docs 2015-02-10 12:55:44 -08:00
Greg Taylor 1379f431ff Updating Client.build() doc to mention rm-mismatch. Fixes #332. 2015-02-05 00:40:24 -05:00
Joffrey F 939bc9ad53 Updated changelog 2015-02-01 16:10:20 -08:00
James Harris 301515ed56 Add Support for Mac Address
The new docker api allows specifing mac address for containers. This change is to allow docker py the same functionality.

Signed-off-by: James Harris <james@rancher.com>
2015-01-21 16:08:16 -07:00
Joffrey F 53ef3c380c Updated version and changelog 2015-01-12 14:16:41 -08:00
Joffrey F 5794b98000 Added deprecation warning for stream parameter in Client.build() 2015-01-12 14:16:13 -08:00
Joffrey F 349c6c5b4f Merge branch 'master' of github.com:docker/docker-py 2015-01-12 12:14:00 -08:00
Joffrey F ba0680d8ce Expanded on boot2docker SSL error resolution 2015-01-12 12:13:37 -08:00
Ignacio Tolstoy cc1b3057a9 Fix closing code tag in TLS doc.
Just a quick fix in the docs.
2015-01-11 16:22:08 +01:00
Sam Thursfield 8ce1e248cd docs: Add specific import_image() variants 2015-01-05 12:33:36 +00:00
Sam Thursfield 47af951ac8 docs: Clarify import_image() docs 2015-01-05 12:26:29 +00:00
Ziad Sawalha 881fe1fd79 Update boot2docker docs with tls workaround 2014-12-20 04:14:45 -06:00
Joffrey F 0ec70a2b08 Updated documentation 2014-12-18 11:20:31 -08:00
Joffrey F f2ad888ee6 Updated changelog 2014-12-18 11:20:31 -08:00
Joffrey F 5711ac4cf3 Updated documentation with HostConfig information 2014-12-17 11:48:39 -08:00
Joffrey F ec04e92c02 timeout param in wait documented 2014-12-15 17:34:51 -08:00
Joffrey F e8c9e6e3f2 Added forcerm param in Client.build 2014-12-15 15:23:25 -08:00
Derek Hammer 7426c52f0e Fix the order of pull 2014-12-15 10:49:37 -08:00
Derek Hammer d8e8400419 Allow for pull as an option to docker build
Signed-off-by: Derek Hammer <derek.r.hammer@gmail.com>
2014-12-13 10:31:47 -08:00
Joffrey F bf077ace10 Removed trailing whitespace in docs 2014-11-14 01:37:46 +01:00
Joffrey F 8df3a3f5ae Moved boot2docker instructions to their own file 2014-11-14 01:35:49 +01:00
Vlad Fratila 773cd0cd57 add documentation for boot2docker #365 2014-11-12 17:02:17 +02:00
Joffrey F 8bc20e6c44 Fixed ChangeLog section titles 2014-11-03 23:53:53 +01:00
Joffrey F 079bf7ecfb exec -> execute 2014-11-03 23:02:14 +01:00
Joffrey F 8ea385eb21 Updated ChangeLog 2014-11-03 20:39:49 +01:00
Joffrey F 37c8072f60 Merge branch 'pause-unpause' of github.com:phensley/docker-py into phensley-pause-unpause
Conflicts:
	README.md
	tests/integration_test.py
	tests/test.py
2014-10-29 19:35:05 +01:00
Joffrey F 75d8ff16e4 Merge branch 'support-devices' of github.com:dims/docker-py into dims-support-devices
Conflicts:
	README.md
2014-10-29 17:23:42 +01:00
Joffrey F e0d6b267ee Merge branch 'exec' of github.com:phensley/docker-py into phensley-exec
Conflicts:
	README.md
2014-10-29 17:19:27 +01:00
micahhausler 77d2f42f7d Migrated change log 2014-10-28 10:42:19 -04:00
micahhausler 47baf2218f Added .version() 2014-10-27 15:13:26 -04:00
micahhausler 0e6b96a70f Added .wait() 2014-10-27 15:06:28 -04:00
micahhausler 7d0f190d0b Capitalize Docker 2014-10-27 14:56:43 -04:00
micahhausler 199023c576 Added markdown docs 2014-10-24 16:55:22 -04:00