Joffrey F
62c94f9634
Remove integration test for APIClient.search method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-26 14:07:41 -08:00
Thomas Schaaf
686d8e9536
Implement cachefrom
...
Signed-off-by: Thomas Schaaf <schaaf@komola.de>
2017-01-26 11:20:01 +00:00
Joffrey F
a1d550a14c
Allow configuring API version for integration test with env var
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-25 16:52:26 -08:00
Joffrey F
848b7aa6a4
Add support for auto_remove in HostConfig
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-25 16:45:59 -08:00
Joffrey F
3e5bb7b0e6
Fix Swarm model init to correctly pass arguments through to init_swarm
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-25 15:28:43 -08:00
Joffrey F
e87ed38f69
Ignore socket files in utils.tar
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-24 18:00:42 -08:00
Joffrey F
06e8081799
Convert mode argument to valid structure in create_service
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-19 16:23:32 -08:00
Joffrey F
bb665257ed
Merge pull request #1393 from aebm/master
...
Fix #1351
2017-01-19 11:55:14 -08:00
Ben Firshman
468bb1c545
Merge pull request #1347 from fcurella/hash
...
Make resources hashable, so that they can be added to `set`s
2017-01-18 16:49:35 +01:00
Alejandro E. Brito Monedero
95b6fddd14
Fix #1351
...
* Fix TypeError when getting the tags property from an image that has
no tags. Ex: An image pulled by cryptohash. It is handled like when
the image doesn't have defined the RepoTags member.
Signed-off-by: Alejandro E. Brito Monedero <alejandro.monedero@gmail.com>
2017-01-16 08:48:41 +01:00
Joffrey F
40089a781c
Detect mount type in parse_mount_string
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 15:13:09 -08:00
Joffrey F
a960731999
Additional parse_mount_string tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 14:33:58 -08:00
Joffrey F
155b95d143
Merge branch 'dz-fix-mount_options' of https://github.com/dzimine/docker-py into dzimine-dz-fix-mount_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 14:19:25 -08:00
Joffrey F
9450442c8c
Accept / as a path separator in dockerignore patterns on all platforms
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-06 16:37:15 -08:00
Dmitri
59ccd8a782
Fix readonly in mounts.
...
Signed-off-by: Dmitri Zimine dz@stackstorm.com
2016-12-28 23:43:15 -08:00
Joffrey F
48c5cd82fc
Prevent Swarm address conflicts
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-08 14:50:05 -08:00
Flavio Curella
6f239fbf29
Make resources hashable, so that they can be added to `set`s
...
Signed-off-by: Flavio Curella <flavio.curella@gmail.com>
2016-12-08 12:19:30 -06:00
徐俊杰
b9c48dca2c
Scope is added in volume after docker 1.12
...
Signed-off-by: pacoxu <paco.xu@daocloud.io>
add ut test for volume scope and no specified name create
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
try to fix ut failure of volume creation
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
try to fix ut failure of volume creation
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
Scope is added in volume after docker 1.12
Signed-off-by: pacoxu <paco.xu@daocloud.io>
Scope is added in volume after docker 1.12
Signed-off-by: pacoxu <paco.xu@daocloud.io>
2016-12-08 10:31:44 +08:00
Joffrey F
d024b1bd78
Merge pull request #1338 from docker/remove_node
...
Implement swarm node removal
2016-12-07 15:37:17 -08:00
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
c239e40504
Implement swarm node removal
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-07 12:24:18 -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
Daniel Nephin
2b85fbf120
Add attachable.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2016-12-05 17:54:18 -05: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
c02493cf18
Merge pull request #1331 from aanand/fix-auth-config-path-windows
...
Fix auth config path on Windows
2016-12-02 18:07:08 -08:00
Joffrey F
d56b2d3dc8
Merge pull request #1315 from bfirsh/rename-docker-py-to-docker-sdk-python
...
Start to rename docker-py to docker-sdk-python
2016-12-02 15:20:34 -08:00
Joffrey F
32cd0161b6
Merge pull request #1330 from docker/walkerlee-master
...
Add options to IPAMConfig
2016-12-02 15:18:41 -08:00
Joffrey F
fd4c01aa99
Merge branch 'master' of https://github.com/walkerlee/docker-py into walkerlee-master
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-02 14:57:57 -08: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
Aanand Prasad
fb4969f744
Fix auth config path on Windows
...
The Engine client looks *only* at the USERPROFILE environment variable
on Windows, so we should do that too.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-12-02 18:02:09 +00:00
Ben Firshman
dfa4b76989
Merge pull request #1328 from docker/ssladapter_transport_module
...
Move ssladapter to transport module
2016-12-02 14:44:03 +00:00
Joffrey F
4539644667
Move ssladapter to transport module
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-01 18:04:40 -08:00
Joffrey F
01c33c0f68
Client -> DockerClient
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-01 18:02:16 -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
Ben Firshman
e7d78d10f6
Merge pull request #1303 from aanand/helpful-containers-warning
...
Show a helpful warning when people try to call `client.containers()`
2016-12-01 11:11:46 +00:00
Joffrey F
239673a51c
Merge pull request #1308 from docker/docker_client
...
Rename Client -> DockerClient
2016-11-30 15:30:40 -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
Ben Firshman
6a16edee3e
Merge pull request #1277 from bodnarbm/do-not-traverse-ignored-directories-with-no-potential-exceptions
...
Do not traverse excluded directories that are not prefixes of dockerignore exceptions.
2016-11-29 10:09:43 +00:00
Joffrey F
f5ac10c469
Rename Client -> DockerClient
...
Replace references to old Client with APIClient
Moved contents of services.md to appropriate locations
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-28 15:28:04 -08: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
75e9d357f7
Merge pull request #1309 from bfirsh/remove-maintainer-from-dockerfiles
...
Remove MAINTAINER from Dockerfiles
2016-11-28 13:14:40 -08:00
Joffrey F
4e08a5cb9e
Merge pull request #1317 from bfirsh/fix-environment-variable-file-with-new-lines
...
Fix parsing for an environment file with newlines
2016-11-28 12:06:38 -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
Aanand Prasad
8c27dd5233
Show a helpful warning when people try to call `client.containers()`
...
People upgrading to docker-py 2.0 without being aware of the new client
API will likely try to call the old `containers()` method. This adds a
helpful warning telling them to use APIClient to get the old API.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-28 19:43:49 +00: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
Jon Cotton
4a7c772daf
Fix parsing for an environment file with newlines
...
Fixes the new, purposely broken test added in the previous commit.
Signed-off-by: Jon Cotton <jc@finaltransfer.net>
2016-11-28 19:41:13 +00:00
Joffrey F
5eacb986d7
Remove support for host_config in Client.start
...
Any additional arguments passed to start will raise a
DeprecatedMethod (DockerException) exception.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-28 18:34:09 +00:00
Ben Firshman
94083f25ac
Start to rename docker-py to docker-sdk-python
...
Pretty much everything except renaming the GitHub repo and
documentation, which is not actually done yet. Nearer the release
we can do a search/replace for all that stuff.
Ref #1310
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 16:45:59 +00:00
Brandon Bodnar
9fc8b3a730
Add unit tests for should_check_directory.
...
Signed-off-by: Brandon Bodnar <bodnarbm@gmail.com>
2016-11-26 21:36:54 -05: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
b5f7d380d0
Add helpful error for APIClient methods on Client
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:05:43 +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
39900c558c
Move APIClient tests into single file
...
For some reason this was spread across two files.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman
e055a1c813
Rename DockerClientTest to BaseAPIClientTest
...
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
Ben Firshman
d5bc7dc99a
Drop support for Python 2.6
...
Because it's ancient. If you're still using it, you can use an old
version of docker-py.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman
19eefcf705
Make docker.ssladaptor a single file
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman
2c9d1110f0
Make docker.auth a single file
...
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
Joffrey F
f262dd6da9
Merge pull request #1281 from TomasTomecek/1265-ssl-test-no-sslX-support-in-openssl
...
ssl,test: OpenSSL may not support ssl2
2016-11-14 12:02:55 -08:00
Aanand Prasad
c66c2d6fa5
Fix linting error
...
This seems to have been ignored by older versions of flake8, and fixed
in version 3.1.0 or 3.1.1.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-14 18:20:13 +00:00
Tomas Tomecek
9a485b30ee
ssl,test: OpenSSL may not support ssl2
...
Fixes #1265
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-11-14 09:05:26 +01: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
Ben Firshman
3c7c231983
Fix broken unit test
...
Introduced by https://github.com/docker/docker-py/pull/1230
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-07 12:20:20 -08: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
Walker Lee
a3981f891d
Add docker network IPAM options parameter
...
Signed-off-by: Walker Lee <walkerlee.tw@gmail.com>
2016-10-27 00:17:05 +08: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
Joffrey F
14634fb50a
Merge pull request #1256 from docker/format_env_unicode_bug
...
Do not break when calling format_environment with unicode values
2016-10-13 12:39:47 -07:00
Joffrey F
059f61bf5a
Do not break when calling format_environment with unicode values
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-12 17:52:43 -07:00
Joffrey F
05f1060824
Remove trailing slashes in result of utils.parse_host
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-12 16:06:43 -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
1e939be5fb
Merge pull request #1210 from docker/identity-token-support
...
Add support for identity tokens in config file
2016-09-16 11:47:48 -07:00
Joffrey F
d731a4315c
Add support for identity tokens in config file.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-15 14:28:09 -07:00
Joffrey F
9141e9496d
Merge pull request #1215 from bfirsh/autopep8
...
Fix a few pep8 issues
2016-09-14 14:08:13 -07: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
6220636536
Fix a few pep8 issues
...
autopep8 --in-place --recursive --experimental -aaa --ignore E309 .
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 16:54:54 +01: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
Ben Firshman
0cdf737625
Fix unit test which doesn't do anything
...
It also overrode the fake API inspect endpoint with a broken
response.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-07 11:40:19 +02: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
Ben Firshman
3769c089e8
Fix licenses
...
* Complete main LICENSE
* Remove unnecessary licenses from individual files
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-05 17:48:09 +02: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
24bfb99e05
Merge pull request #1167 from docker/1075-from-env-version
...
Support version parameter in `Client.from_env`
2016-08-25 14:59:46 -07:00