Commit Graph

208 Commits

Author SHA1 Message Date
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