Commit Graph

115 Commits

Author SHA1 Message Date
Joffrey F 738cfdcdf9 Update code and tests for Engine 1.13 compatibility
Makefile now runs tests against Docker 1.13 RC

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-07 14:51:14 -08:00
Joffrey F b71f34e948 Fix typo in create_network
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-06 11:26:53 -08:00
Ben Firshman dd8ad21c88 Merge pull request #1272 from TomasTomecek/1271-fix-detach-in-exec-start
exec: fix running with detach=True
2016-12-05 11:00:10 +00:00
Joffrey F 88b733b0f4 Merge branch 'patch-1' of https://github.com/manics/docker-py into manics-patch-1
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-02 14:50:40 -08:00
Joffrey F 993f298e85 Move config type creation from docker.utils functions to classes in
docker.types

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-01 16:06:41 -08:00
Tomas Tomecek 515db1f6fd exec: fix running with detach=True
Fixes #1271

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-11-29 16:04:52 +01:00
Joffrey F 9643253c50 Merge pull request #1297 from docker/stepanstipl-allow_custom_pid_mode
Allow custom pid mode
2016-11-28 14:00:07 -08:00
Joffrey F 44e57fb95d Re-enable pid_mode checks for API < 1.24
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-28 12:01:25 -08:00
Stepan Stipl 7ef48c3769 Allow custom PID mode for the container
Docker added support for sharing PID namespaces with other containers
since version 1.12 (see https://github.com/docker/docker/pull/22481).

Signed-off-by: Stepan Stipl <stepan@stipl.net>
2016-11-28 11:42:00 -08:00
Ben Firshman b4c02393b2
Remove MAINTAINER from Dockerfiles
It was deprecated in https://github.com/docker/docker/pull/25466

(Sorry @shin- ;)

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-24 13:32:20 +00:00
Ben Firshman 1984f68730
Add new user-focused API
See #1086

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:05:43 +00:00
Ben Firshman d98a879016
Add random_name test helper
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman 6334312e47
Split out base integration test for APIClient
So the cleanup stuff can be reused for model tests.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman 9daa320454
Rename Client to APIClient
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman c7903f084e
Remove AutoVersionClient
Just do Client(version='auto').

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Joffrey F f12b618ee9 Merge pull request #1236 from docker/host_config_isolation
Add support for isolation param in host config
2016-11-17 17:42:57 -08:00
Aanand Prasad e4b6d0dca6 Convert dicts to Healthcheck objects, string commands to CMD-SHELL lists
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:04:17 +00:00
Aanand Prasad 6bb7844ab3 Rework healthcheck integration test
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:04:17 +00:00
Jamie Greeff b4f2b5fa70 Add support for passing healthcheck to create_container
Signed-off-by: Jamie Greeff <jamie@greeff.me>
2016-11-16 16:04:17 +00:00
Simon Li cb967ef682 Add test for creating service with env
Signed-off-by: Simon Li <orpheus+devel@gmail.com>
2016-11-11 16:29:43 +00:00
Ryan Belgrave 98e2e1fcd6
Add labels and shmsize arguments to the image build
Signed-off-by: Ryan Belgrave <Ryan.Belgrave@target.com>
2016-11-08 09:45:32 -06:00
Joffrey F f745c8e7c5 Merge pull request #1230 from LabattFoodService/updateNode
enable setting of node labels #1225
2016-11-07 10:47:55 -08:00
Joffrey F be2ae8df36 WIP
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-04 15:10:12 -07:00
Alessandro Boch 54586053b1 Changes for service tests to pass in docker master
- update config structure has new members
- service name update is no longer supported

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-01 16:56:37 -07:00
Joffrey F 9b35c74f0e Fix dockerignore exclusion logic on Windows
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-14 16:02:28 -07:00
Joffrey F cec3fe7c31 Update tests to avoid failures on Windows platforms
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-14 16:02:28 -07:00
Ben Firshman 69e992ec48
Move requires_api_version to helpers
Because it's a helper, not a base thing. In preparation for
moving/deleting the unit test base classes.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-03 11:58:08 +01:00
Ben Firshman 7339d77043
Move BaseTestCase to BaseIntegrationTest
Because two things called `BaseTestCase` is quite confusing.
I haven't bothered refactoring the other `BaseTestCase` because
that disappears anyway when we drop Python 2.6 support.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-03 11:58:08 +01:00
Joffrey F 49997d040b Add support for isolation param in host config
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-29 16:34:36 -07:00
Joffrey F 2b34e0b8e4 Merge pull request #1224 from mferon/addRestartPolicyUpdateSupport
Add support for restart policy update
2016-09-29 14:53:53 -07:00
Alessandro Boch a864059b83 Adjust test_create_network_with_ipam_config
- to account for API change: IPAM class will now
  also include a Data class, besides Config.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-29 09:49:58 -07:00
Maxime Feron a665c8c443 Add support for restart policy update
Signed-off-by: Maxime Feron <maxime.feron@corp.ovh.com>
2016-09-28 10:21:59 +02:00
Nathan Shirlberg 6ef14932d0 enable setting of node labels #1225
Added update_node function to enable setting labels on nodes.  This
exposes the Update a Node function from the Docker API and should
enable promoting/demoting manager nodes inside a swarm.

Signed-off-by: Nathan Shirlberg <nshirlberg@labattfood.com>
2016-09-27 11:26:26 -05:00
Joffrey F 89afee94fd Merge pull request #1213 from bfirsh/parse-json-errors
Parse JSON API errors
2016-09-14 11:09:55 -07:00
Ben Firshman ca51ad29a5
Ignore not in swarm error when force leaving
Real errors were getting swallowed in these tests, producing
other confusing cascading errors. This makes it much easier to
make sure a node is not in a Swarm, while also handling other
errors correctly.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 16:00:03 +01:00
Ben Firshman dcd01f0f48
Parse JSON API errors
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 14:54:40 +01:00
Joffrey F 75497e0752 Add test for import_image with changes param
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-06 15:38:44 -07:00
Joffrey F 6552076856 Add support for force disconnect
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-31 18:44:36 -07:00
Joffrey F a665dfb375 Add support for labels and enable_ipv6 in create_network
Tests + docs

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-31 18:26:16 -07:00
Joffrey F 0e4314a872 Merge branch 'jp-cpushares' of https://github.com/joshpurvis/docker-py into joshpurvis-jp-cpushares 2016-08-23 15:12:30 -07:00
Joffrey F 775b581c04 Private images support in create_service / update_service
Refactor auth header computation

Add tasks methods and documentation.

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-23 14:52:07 -07:00
Joffrey F 7d5a1eeb7a Add services documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-22 17:45:10 -07:00
Joffrey F 97094e4ea3 New docker.types subpackage containing advanced config dictionary types
Tests and docs updated to match
docker.utils.types has been moved to docker.types

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-19 16:51:13 -07:00
Joffrey F 02e99e4967 Service API integration tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-17 18:42:52 -07:00
Brian Goff 0f47db7fcc Remove references to "ExecutionDriver"
Docker no longer has an `ExecutionDriver` as of Docker 1.11.
The field in the `docker info` API will not be present in 1.13.

Found this while working on docker/docker#25721

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-17 12:20:13 -07:00
Josh Purvis 7d147c8ca1 Move cpu_shares and cpuset_cpu to HostConfig when API >= 1.18
Signed-off-by: Josh Purvis <joshua.purvis@gmail.com>
2016-08-15 16:33:58 -04:00
Joffrey F a75553b3ca Add `nodes` and `inspect_node` methods
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-11 17:47:02 -07:00
Joffrey F 0f70b6a38b Add support for custom name in SwarmSpec
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-04 16:48:21 -07:00
Joffrey F 25db440c96 Update arguments for several Swarm API methods
Add Client.update_swarm method
Add test for Client.update_swarm

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-04 15:11:13 -07:00
Joffrey F 1f055796a8 Add new init_swarm test with custom spec
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-03 18:00:29 -07:00