Commit Graph

1328 Commits

Author SHA1 Message Date
Daniel Nephin c698674602 Merge pull request #808 from alasdairnicol/docs_examples
Docs examples
2015-10-15 10:40:06 -04:00
Joffrey F 51d2125c59 Pull correct version of busybox in integration tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:37:45 -07:00
Joffrey F 80baee55b6 Merge branch 'delfick-patch-1' 2015-10-14 17:34:11 -07:00
Stephen Moore 7f3692ceed Fix attach method over SSL connections
Signed-off-by: Stephen Moore <stephen@delfick.com>
2015-10-14 17:29:31 -07:00
Joffrey F b1f25317de Use DOCKER_CONFIG environment variable to look up auth config
When provided, default paths are ignored.

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F 0932ac230b Add devices param to the hostconfig documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F 9697923bca Update changelog and bump version to 1.5.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F a3a345e2f6 Use url-safe base64 when encoding auth header
+ regression test

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F 147df4d21f put/get archive implementation
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F 6a66a2248d Docs: Remove float from valid cpu_shares types
Fixes #775

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F 55a0783f4b Fix tests
Skips were masking some errors / compatibility issues

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Joffrey F d141976303 Add minimum_version decorators on NetworkApi methods
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
Aanand Prasad 53589e5f0a Implement methods for managing networks
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-14 17:26:50 -07:00
Joffrey F a1393ee8ac Don't break when volume binds contain unicode characters
Also includes a few unit tests for utils.convert_volume_binds

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07: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 baaa3e3b1a Merge pull request #802 from docker/785-docker_config_env
Use DOCKER_CONFIG environment variable to look up auth config
2015-10-13 18:18:36 -07:00
Joffrey F 36f3480ccc Merge pull request #801 from docker/1.5.0-release
1.5.0 release
2015-10-12 13:49:48 -07:00
Joffrey F 23cf76838a Use DOCKER_CONFIG environment variable to look up auth config
When provided, default paths are ignored.

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-09 17:15:19 -07:00
Joffrey F 16247df3c2 Merge pull request #806 from docker/803-urlsafe-b64
Use url-safe base64 when encoding auth header
2015-10-09 14:13:21 -07:00
Joffrey F 3c4e5db113 Use url-safe base64 when encoding auth header
+ regression test

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-09 12:23:58 -07: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
Joffrey F eb869c0bd3 Fix tests
Skips were masking some errors / compatibility issues

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-08 12:09:59 -07:00
Joffrey F 77df9c485d Merge branch 'aanand-networking' 2015-10-08 08:02:48 -07:00
Joffrey F 75e55f1805 Add minimum_version decorators on NetworkApi methods
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-08 08:02:03 -07:00
Joffrey F c5e68e6fc6 Merge branch 'networking' of https://github.com/aanand/docker-py into aanand-networking 2015-10-08 07:56:50 -07:00
Joffrey F 73e45ef359 Merge pull request #787 from docker/782-unicode-volume-paths
Don't break when volume binds contain unicode characters
2015-10-05 14:26:07 -07:00
Aanand Prasad 1df3226c9b Implement methods for managing networks
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-05 16:46:25 +01: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
mnowster 1c97c691bf Merge pull request #797 from paulbellamy/test-race-condition
Fix race condition in integration regression tests
2015-10-01 15:39:47 +01:00
mnowster 81bf8e6809 Merge pull request #790 from aanand/shorter-stack-traces
Shorter stack traces in tests
2015-10-01 14:34:48 +01:00
Mazz Mosley 7ed8eb5da9 Remove skip test
It has been reported that the bug in docker has now been fixed so we can
re-instate this test.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-01 14:19:34 +01:00
Paul Bellamy 19291ee20d Fix race condition in integration regression tests
`docker port` and inspect do not return ports for containers which are
not running. Because the container command is `true`, sometimes that
exits before the inspect is called.

Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
2015-10-01 14:05:50 +01:00
Joffrey F 7884ab9fe2 Merge pull request #789 from PierreF/top_ps_args
Allow to specify ps_args when listing processes
2015-09-28 14:36:08 -07:00
Joffrey F f51ae4b309 Merge pull request #793 from docker/792-fix-ports-command
Support explicit protocol in Client.port
2015-09-28 14:35:47 -07:00
Joffrey F d0ccc2e261 Support explicit protocol in Client.port
User can now specify a protocol in Client.port using the port/proto
syntax. Default port is now TCP instead of UDP (to match the
behavior of `docker port`) when no proto is specified.
Regression test

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-28 12:06:10 -07:00
Pierre Fersing c1577606be Added test for "top" function
Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
2015-09-28 11:59:25 +02:00
Joffrey F 29219a278b Don't break when volume binds contain unicode characters
Also includes a few unit tests for utils.convert_volume_binds

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-25 14:36:39 -07:00
Joffrey F 5e331a55a8 Merge branch 'aanand-url-variable-args' 2015-09-25 14:25:20 -07:00
Aanand Prasad 29b12cf007 _url can take arbitrarily many arguments
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-25 14:25:00 -07:00
Aanand Prasad 95f42d1631 Shorter pytest stack traces
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-25 20:17:25 +02:00
Aanand Prasad b2c4228bb8 Move pytest default options into pytest.ini
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-25 20:16:57 +02: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
Aanand Prasad 26e22bbd39 Merge pull request #770 from docker/cpu_cfs_opts_support
Support for cpu_quota and cpu_period
2015-09-25 09:52:38 +02:00
Joffrey F 3c5185c199 Check API version when using cpu_period and cpu_quota
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-24 10:08:02 -07:00
Joffrey F d89b2a01f0 cpu_quota and cpu_period unit tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-24 10:08:02 -07:00
Joffrey F 3ee30ed5e4 Add support for cpu_quota and cpu_period in host_config
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-24 10:08:02 -07:00