Commit Graph

3158 Commits

Author SHA1 Message Date
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
Joffrey F 02f330d8dc Merge pull request #765 from docker/api_1.20_support
Support API version 1.20
2015-09-23 15:32:00 -07:00
Joffrey F 48d72f6703 Bump default API version
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-23 11:35:57 -07:00
Joffrey F 4f992904f0 Merge pull request #786 from ibuildthecloud/missing-api
Add docker.api to setup packages
2015-09-22 16:29:09 -07:00
Darren Shepherd 10055eb9dd Add docker.api to setup packages
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-09-22 16:08:33 -07: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 da2b797323 Improve volume bindings integration test
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-22 14:30:03 -07:00
Joffrey F d6a86e1d69 Fix volumes tests for API version >= 1.20
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-22 14:17:19 -07:00
Joffrey F 8c270dfdf0 Merge pull request #780 from docker/contributing
[WIP] Contributing guidelines
2015-09-22 14:06:20 -07:00
Joffrey F 50a33542c8 Merge branch 'aanand-integration-test-fixes' 2015-09-22 11:35:19 -07:00
Aanand Prasad eec0465832 Make volume binds tests work on any host
Instead of creating the test directory directly on the host, create it
by starting a container with the directory bind-mounted, so that it
doesn't matter whether the daemon is local, in a VM or remote.

This removes the need to make /tmp a volume in the test container, and
to share it with the dind container.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-22 11:34:49 -07:00
Aanand Prasad 3d6c91b469 Only pull busybox in integration tests if we don't already have it
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-22 14:25:28 +02:00
Joffrey F 72b8a295db Amend version of contributing.md from feedback
- Add OS info request in reporting issues section
- Add PR subsection about clear, logical commits
- Add section describing how to set up a dev environment

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-21 15:35:29 -07:00
Joffrey F c4153c9c87 Add flake8 make task
Fix 'make test' task to run a complete series of tests

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-21 15:35:28 -07:00
Joffrey F d13ab45bb1 Contributing document draft
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-21 15:35:28 -07:00
Joffrey F ef0c373f14 Pin busybox version to use in integration tests
Removed obsolete non-streaming build test

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-21 15:34:10 -07:00
Joffrey F b3ccdfbf4f Merge pull request #781 from docker/coverage-pin
Force coverage dependency to a version supporting py3.2
2015-09-21 14:57:27 -07:00
Joffrey F 946f176d70 Force coverage dependency to a version supporting py3.2
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-21 14:30:44 -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
Joffrey F 9d1f95715a Merge pull request #779 from rutsky/patch-4
fix network_mode 'none' value
2015-09-18 17:12:42 -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