1ea6618b09
Add support for start_period in Healthcheck spec
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-16 17:02:59 -07:00
8645d1d41b
Merge pull request #1617 from docker/create-ingress-network
...
Add support for ingress in create_network
2017-06-16 12:06:56 -07:00
2086c20ce1
Merge pull request #1631 from madhuri-rai07/master
...
Add support for ``runtime`` config
2017-06-16 12:05:15 -07:00
87d5cd1b0a
Merge pull request #1632 from kaiyou/master
...
allow ipv6 :: notation in split_port (using re)
2017-06-16 11:57:52 -07:00
e50eacd9ea
Merge pull request #1648 from ChrsMark/master
...
Raising error in case of invalid value of since kwarg on Container.logs
2017-06-16 11:49:30 -07:00
d638829f73
Closes #1588 , image.tag does not return anything
...
This patch returns the check made against api when tagging an image as stated in documentation
Signed-off-by: Olivier Sallou <olivier.sallou@irisa.fr>
2017-06-16 17:49:43 +02:00
c03a009e2d
Raising error in case of invalid value of since kwarg on Container.logs
...
Signed-off-by: Chris Mark <chrismarkou92@gmail.com>
2017-06-16 18:30:24 +03:00
1eef700eb7
Merge pull request #1634 from grahamlyons/readtimeout_calling_container_stop
...
Ensure default timeout is used by API Client
2017-06-14 15:18:10 -07:00
234296171f
Only pull the 'latest' tag when testing images
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2017-06-14 14:05:26 +00:00
ee75a1c2e3
Ensure default timeout is used by API Client
...
The `from_env` method on the `docker` module passed `None` as the
value for the `timeout` keyword argument which overrode the default
value in the initialiser, taken from `constants` module.
This sets the default in the initialiser to `None` and adds logic
to set that, in the same way that `version` is handled.
Signed-off-by: grahamlyons <graham@grahamlyons.com>
2017-06-08 14:39:17 +01:00
612c0f3d0d
Fix test cases for ``runtime`` config
...
Signed-off-by: Madhuri Kumari <madhuri.kumari@intel.com>
2017-06-07 10:47:27 +05:30
0c1271350d
Add a specific unit test for splitting port with IPv6
...
The test was copied from ccec87ca2c
2017-06-05 18:21:33 +02:00
6ae24b9e60
Add support for ``runtime`` in container create and run API
2017-06-01 15:09:46 +00:00
1223fc144f
new integration task linting for #1625
...
Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com>
2017-05-27 11:24:58 +10:00
6ef9d426eb
added integration test for #1625 for ImageCollection.build() that verfies that the build method uses the last success message for extracting the image id
...
Signed-off-by: Chris Ottinger <chris.ottinger@team.telstra.com>
2017-05-27 10:29:36 +10:00
41aae65ab2
update swarm remove test status code from 500 to >= 400
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-05-18 10:06:58 +08:00
fb16d14544
Merge pull request #1615 from docker/service-placement
...
Add support for placement preferences and platforms in TaskTemplate
2017-05-17 15:25:40 -07:00
ff718f5dac
Add support for ingress in create_network
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-17 15:25:10 -07:00
9cc021dfa6
Add support for placement preferences and platforms in TaskTemplate
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-17 13:48:30 -07:00
e4093ab258
Add `target` argument to image building
...
This is related to the multi-stage image building
that was introduced in 17.05 (API 1.29).
This allows a user to specify the stage of a multi-stage
Dockerfile to build for, rather than the final stage.
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-05-16 16:13:54 +08:00
2aa63dd9a6
Merge pull request #1605 from allencloud/update-test-status-code-from-500-to-400
...
update docker-py test status code from 500 to 400
2017-05-15 12:18:51 -07:00
717459db0e
update docker-py test status code from 500 to 400
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-05-13 09:31:42 +08:00
95297dc2e7
Replace erroneous networks argument in containers.run with singular
...
network equivalent.
Small docfixes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-12 14:28:27 -07:00
6ed0c01018
Adjust tests and add newest engine version to Jenkinsfile
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-09 17:18:46 -07:00
bf60e2a330
init_path removed in Engine 17.05
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-09 16:16:10 -07:00
c6ddea469f
Include tag in images.get after pulling if provided separately
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-09 12:24:40 -07:00
f27ecf3f88
Add ContainerSpec mounts test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-08 14:13:59 -07:00
e19aad860c
Merge branch '1577-multi-success-message' of https://github.com/aaronthebaron/docker-py into aaronthebaron-1577-multi-success-message
2017-05-05 15:01:16 -07:00
c6030027f5
Modernize exec_api.py
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-02 17:09:09 -07:00
7dffc46234
Add integration tests
...
Signed-off-by: Aaron Cowdin <aaron.cowdin@gmail.com>
2017-05-02 17:01:34 -07:00
13dfb13858
Merge branch 'add-env-support-to-exec' of https://github.com/TomasTomecek/docker-py into TomasTomecek-add-env-support-to-exec
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-02 16:38:40 -07:00
2a0a7adece
Fix typo s/CpuSetCpus/CpusetCpus/
...
According to Docker's API documentation [1]. The parameter name
is `CpusetCpus` not `CpuSetCpus`.
[1] https://docs.docker.com/engine/api/v1.25/#operation/ContainerCreate
Signed-off-by: Dan Liew <daniel.liew@imperial.ac.uk>
2017-05-01 14:56:40 +01:00
b9ca8755bb
Add missing support for `CpusetMems` parameter to HostConfig.
...
Signed-off-by: Dan Liew <daniel.liew@imperial.ac.uk>
2017-05-01 14:56:40 +01:00
4633dac580
exec: add support for `Env`
...
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2017-04-29 08:56:51 +02:00
72b9b72359
Merge pull request #1570 from AlexeyRokhin/master
...
Add cpu_count, cpu_percent, nano_cpus parameters to container HostConfig.
2017-04-28 14:16:25 -07:00
c2f83d558e
cpus renamed to nano_cpus. Type and scale of nano_cpus are changed. Comments for new parameters are changed.
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-04-28 15:55:44 +03:00
d19572aae3
Merge pull request #1493 from funkyfuture/model_properties
...
Adds a few model properties
2017-04-27 16:21:02 -07:00
5f9a599b0f
Fix if replicas is set to 0, Fixes #1572
...
Signed-off-by: Rob Kooper <kooper@illinois.edu>
2017-04-26 22:50:17 -05:00
3f7d622143
Add cpu_count, cpu_percent, cpus parameters to container HostConfig.
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-04-19 15:07:02 +03:00
659090fc99
Adds an 'image' property to the container model
...
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2017-04-15 15:46:52 +02:00
b585ec59a8
Adds a 'labels' property to the image model
...
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2017-04-15 15:46:52 +02:00
1cd56b9f0c
Adds a 'labels' property to the container model
...
The Docker API seems to respond with a 'null' value for the 'Labels'
attribute from containers that were created with older Docker versions.
An empty dictionary is returned in this case.
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2017-04-15 15:46:52 +02:00
79edcc28f7
Add support for volume_driver in HostConfig
...
Some cleanup in ContainerConfig + warning if volume_driver is provided (API>1.20)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-05 17:05:08 -07:00
73d8097b3d
Fix test issues
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-29 15:39:48 -07:00
c5d35026ce
Set infinite timeout for the `events` method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-27 15:57:36 -07:00
cb68acbaae
Merge pull request #1524 from alex-dr/fix-apierror-status
...
Fix APIError status_code property for client/server errors
2017-03-22 15:29:23 -07:00
e0e7404380
Fix APIError status_code property for client/server errors
...
requests.Response objects evaluate as falsy when the status_code
attribute is in the 400-500 range. Therefore we are assured that
prior to this change, APIError would show `is_server_error() == False`
when generated with a 500-level response and `is_client_error() == False`
when generated with a 400-level response. This is not desirable.
Added some seemingly dry (not DRY) unit tests to ensure nothing silly
slips back in here.
Signed-off-by: alex-dr <alex@datarobot.com>
2017-03-22 00:49:07 -04:00
aeb5479fd5
Use experimental engine for testing in Jenkins/Makefile
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-17 18:30:33 -07:00
daac15c1fa
Add service_logs integration test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-13 17:29:04 -07:00
54b3c364cb
Raise an error when passing an empty string to split_port
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-09 16:12:48 -08:00
c2d114c067
Move LinksTest to appropriate file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-09 16:12:22 -08:00
eba20084f6
fix: Missing exception handling in split_port when no container port
...
"localhost:host_port:" case will raise TypeError exception directly
Catch the "TypeError" and give proper error message
* docker/utils/ports.py
Signed-off-by: Lei Gong <xue177125184@gmail.com>
2017-03-09 16:28:34 +08:00
fa52824363
Merge pull request #1481 from shin-/system_df
...
Add df method
2017-03-06 11:08:41 -08:00
11873993eb
Merge pull request #1480 from shin-/bump-default-api-version
...
Bump default API version to 1.26
2017-03-06 11:08:16 -08:00
8c6534d7be
Add init_path parameter to container HostConfig
...
Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
2017-03-01 14:02:35 -08:00
13b5f785a7
Add init parameter to container HostConfig
...
Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
2017-03-01 14:02:35 -08:00
d59b6b99cc
Merge pull request #1479 from shin-/plugin-upgrade
...
Add upgrade_plugin method
2017-03-01 13:52:46 -08:00
4273d3f63d
Bump default API version to 1.26
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 13:52:07 -08:00
cfb14fa78f
Add df method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 13:51:39 -08:00
5dced6579a
Update assert in test_create_with_restart_policy
...
In https://github.com/docker/docker/pull/30870 a new
error message is displayed if the container is restarting.
To make "test_create_with_restart_policy" pass against the
above change, the test checks that the error message contains
"You cannot remove " instead of
"You cannot remove a running container"
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-03-01 15:36:32 +02:00
48ac772994
Add upgrade_plugin method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-23 17:27:04 -08:00
f387ae46d7
Merge pull request #1467 from crierr/master
...
Allow port range like 8000-8010:80
2017-02-22 15:27:42 -08:00
f9f77c4c2f
Merge pull request #1473 from Anvil/event-http-headers
...
Allow events daemon command to read config.json
2017-02-21 12:11:58 -08:00
f36ef399ad
Fixed events command related unit tests by passing a timeout value
...
Signed-off-by: Damien Nadé <github@livna.org>
2017-02-21 18:21:10 +01:00
cfc11515bc
Allow port range like 8000-8010:80
...
Signed-off-by: SeungJin Oh <crierr@naver.com>
2017-02-20 02:09:33 +09:00
44c31e47e0
Add ability to set 'Hostname' on a Service.
...
Signed-off-by: Nils Krabshuis <nils.krabshuis@redwood.com>
2017-02-19 06:18:26 +01:00
e0b6cdfcf6
Merge pull request #1460 from shin-/fix-cache-from
...
Rename cachefrom -> cache_from
2017-02-16 13:35:58 -08:00
0a97df1abc
Rename cachefrom -> cache_from
...
Fix cache_from integration test
Fix image ID detection in ImageCollection.build
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-15 19:13:24 -08:00
3a9c83509c
Add xfail mark to storageopt test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-15 19:02:31 -08:00
4a50784ad4
Merge pull request #1459 from shin-/1300-storageopts
...
Add support for storage_opt in host_config
2017-02-15 18:12:31 -08:00
afcbeb5e4f
Merge pull request #1449 from shin-/secrets-api
...
Implement secrets API
2017-02-15 18:08:25 -08:00
ece3b19782
Add support for storage_opt in host_config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-15 17:43:24 -08:00
20c6fe31e0
Add support for recursive wildcard pattern in .dockerignore
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-14 18:29:37 -08:00
e8a86e40cc
Add tests for secret API implementation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 17:06:25 -08:00
35f37a0936
Merge pull request #1432 from shin-/plugins
...
Plugins API
2017-02-13 13:20:53 -08:00
e1ad3186ef
Add create_plugin implementation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-09 17:58:05 -08:00
f83993de0a
Fix passing volumes to run with no host path
...
Technically we shouldn't be passing them as binds, but the daemon
doesn't seem to mind.
Fixes #1380
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2017-02-07 19:22:36 +01:00
956fe1cac1
Fix volume path passed by run to create_container
...
Seems like this is pretty much ignored by Docker, so it wasn't
causing any visible issues, except when a volume name was used
instead of a path.
Also, added integration tests.
Ref #1380
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2017-02-07 19:22:35 +01:00
42b9358458
Merge pull request #1425 from shin-/prunes
...
Prunes
2017-02-03 19:49:54 -08:00
9296971e4c
APIClient implementation of plugin methods
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-03 19:45:59 -08:00
b3ea1fb942
Merge pull request #1429 from shin-/fix_remove_network_test
...
Improve robustness of remove_network integration test
2017-01-30 19:13:22 -08:00
83b45b7d54
Add prune_networks method
...
Ensure all integration tests use the same version of the busybox image
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-30 18:54:18 -08:00
89d3803344
Add prune_volumes method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-30 18:53:46 -08:00
7f0c2e7531
Add prune_images method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-30 18:53:46 -08:00
f2a867f04b
Add prune_containers method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-30 18:53:46 -08:00
bf41c7fa67
Improve robustness of remove_network integration test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-30 18:52:11 -08:00
08aac9d571
Merge pull request #1341 from pacoxu/patch-1
...
Scope is added in volume after docker 1.12
2017-01-30 11:59:00 -08:00
d22e2fec6f
Add support for force_update in TaskTemplate
...
Add min version checks in create_service and update_service
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-27 17:19:18 -08:00
fc5cd1a914
Add support for max_failure_ratio and monitor in UpdateConfig
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-27 16:40:05 -08:00
847f209865
Add stop_timeout to create_container
...
Fix requires_api_version test decorator
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-27 16:00:18 -08:00
0186456f3c
Merge pull request #1413 from docker/force_remove_volume
...
Add 'force' parameter in remove_volume
2017-01-26 14:40:00 -08:00
2d93674903
Merge pull request #1419 from docker/remove_obsolete_search_test
...
Remove integration test for APIClient.search method
2017-01-26 14:34:10 -08:00
a24b114af3
Add 'force' parameter in remove_volume
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-26 14:24:52 -08:00
64519a2b20
Merge pull request #1415 from docker/autoremove_support
...
Add support for auto_remove in HostConfig
2017-01-26 14:24:23 -08:00
62c94f9634
Remove integration test for APIClient.search method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-26 14:07:41 -08:00
686d8e9536
Implement cachefrom
...
Signed-off-by: Thomas Schaaf <schaaf@komola.de>
2017-01-26 11:20:01 +00:00
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
848b7aa6a4
Add support for auto_remove in HostConfig
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-25 16:45:59 -08:00
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
e87ed38f69
Ignore socket files in utils.tar
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-24 18:00:42 -08:00
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
bb665257ed
Merge pull request #1393 from aebm/master
...
Fix #1351
2017-01-19 11:55:14 -08:00
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
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
40089a781c
Detect mount type in parse_mount_string
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 15:13:09 -08:00
a960731999
Additional parse_mount_string tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 14:33:58 -08:00
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
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
59ccd8a782
Fix readonly in mounts.
...
Signed-off-by: Dmitri Zimine dz@stackstorm.com
2016-12-28 23:43:15 -08:00
48c5cd82fc
Prevent Swarm address conflicts
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-08 14:50:05 -08:00
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
d024b1bd78
Merge pull request #1338 from docker/remove_node
...
Implement swarm node removal
2016-12-07 15:37:17 -08:00
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
c239e40504
Implement swarm node removal
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-07 12:24:18 -08:00
b71f34e948
Fix typo in create_network
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-06 11:26:53 -08:00
2b85fbf120
Add attachable.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2016-12-05 17:54:18 -05:00
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
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
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
32cd0161b6
Merge pull request #1330 from docker/walkerlee-master
...
Add options to IPAMConfig
2016-12-02 15:18:41 -08:00
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
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
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
dfa4b76989
Merge pull request #1328 from docker/ssladapter_transport_module
...
Move ssladapter to transport module
2016-12-02 14:44:03 +00:00
4539644667
Move ssladapter to transport module
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-01 18:04:40 -08:00
01c33c0f68
Client -> DockerClient
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-01 18:02:16 -08:00
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
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
239673a51c
Merge pull request #1308 from docker/docker_client
...
Rename Client -> DockerClient
2016-11-30 15:30:40 -08:00
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
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
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
9643253c50
Merge pull request #1297 from docker/stepanstipl-allow_custom_pid_mode
...
Allow custom pid mode
2016-11-28 14:00:07 -08:00
75e9d357f7
Merge pull request #1309 from bfirsh/remove-maintainer-from-dockerfiles
...
Remove MAINTAINER from Dockerfiles
2016-11-28 13:14:40 -08:00
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
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
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
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
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
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
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
9fc8b3a730
Add unit tests for should_check_directory.
...
Signed-off-by: Brandon Bodnar <bodnarbm@gmail.com>
2016-11-26 21:36:54 -05:00
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
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
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
d98a879016
Add random_name test helper
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
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
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
e055a1c813
Rename DockerClientTest to BaseAPIClientTest
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
9daa320454
Rename Client to APIClient
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
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
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
19eefcf705
Make docker.ssladaptor a single file
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
2c9d1110f0
Make docker.auth a single file
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
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
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
6bb7844ab3
Rework healthcheck integration test
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:04:17 +00:00
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
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
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
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
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
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
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
f745c8e7c5
Merge pull request #1230 from LabattFoodService/updateNode
...
enable setting of node labels #1225
2016-11-07 10:47:55 -08:00
be2ae8df36
WIP
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-04 15:10:12 -07:00
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
a3981f891d
Add docker network IPAM options parameter
...
Signed-off-by: Walker Lee <walkerlee.tw@gmail.com>
2016-10-27 00:17:05 +08:00
9b35c74f0e
Fix dockerignore exclusion logic on Windows
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-14 16:02:28 -07:00
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
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
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
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
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
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
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
2b34e0b8e4
Merge pull request #1224 from mferon/addRestartPolicyUpdateSupport
...
Add support for restart policy update
2016-09-29 14:53:53 -07:00
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
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
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
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
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
9141e9496d
Merge pull request #1215 from bfirsh/autopep8
...
Fix a few pep8 issues
2016-09-14 14:08:13 -07:00
89afee94fd
Merge pull request #1213 from bfirsh/parse-json-errors
...
Parse JSON API errors
2016-09-14 11:09:55 -07:00
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
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
dcd01f0f48
Parse JSON API errors
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 14:54:40 +01:00
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
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
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
6552076856
Add support for force disconnect
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-31 18:44:36 -07:00
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
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
764d7b38c4
Support version parameter in `Client.from_env`
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-25 14:44:13 -07:00
2ef02df2f0
Merge pull request #1168 from docker/aiden0z-master
...
Support pids_limit in HostConfig
2016-08-25 14:38:22 -07:00
5bedd32a69
Fix creating containers with env vars with unicode characters
...
Signed-off-by: Fernando Mayo <fernando@docker.com>
2016-08-25 13:36:02 +02:00
902c7a76cc
Docs and tests for pids_limit.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-23 17:05:08 -07:00
fb41965272
Merge pull request #1082 from masci/fix_stream_helper
...
Invoke self._result passing `json=True` when `decode=True`
2016-08-23 15:34:35 -07:00
fc72ac66e9
support MemoryReservation and KernelMemory
...
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
2016-08-23 15:32:06 -07:00
797f1edc20
Merge branch 'master' of https://github.com/srikalyan/docker-py into srikalyan-master
2016-08-23 15:16:15 -07:00
0e4314a872
Merge branch 'jp-cpushares' of https://github.com/joshpurvis/docker-py into joshpurvis-jp-cpushares
2016-08-23 15:12:30 -07:00
0acdd19665
Merge pull request #1131 from Knetic/dnsopts
...
Implemented dns_opt support (from api 1.21)
2016-08-23 15:04:25 -07:00
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
7d5a1eeb7a
Add services documentation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-22 17:45:10 -07:00
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
02e99e4967
Service API integration tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-17 18:42:52 -07:00
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
3062ae4348
docker client consistency: don't quote ':/'
...
E.g.
docker client
`/v1.21/images/localhost:5000/busybox/push?tag=`
docker-py
`/v1.21/images/localhost%3A5000%2Fbusybox/push`
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-08-17 12:20:13 -07:00
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
a75553b3ca
Add `nodes` and `inspect_node` methods
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-11 17:47:02 -07:00
08b284ab39
docker client consistency: don't quote ':/'
...
E.g.
docker client
`/v1.21/images/localhost:5000/busybox/push?tag=`
docker-py
`/v1.21/images/localhost%3A5000%2Fbusybox/push`
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-08-10 09:30:19 +02:00
93b4b4134e
Implemented dns_opt support (from api 1.21)
...
Signed-off-by: George Lester <glester491@gmail.com>
2016-08-07 14:23:22 -07:00
0f70b6a38b
Add support for custom name in SwarmSpec
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-04 16:48:21 -07:00
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
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
07563cfe3f
Update swarm methods to include newly added parameters
...
Rename swarm methods to be more explicit
Utility methods / types to create swarm spec objects
Integration tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-03 16:58:26 -07:00
9d48b4f603
Test fixes and updated Makefile for 1.12 testing
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-03 16:48:41 -07:00
ae7cb4b99f
Avoid crashing in update_headers decorator when headers kwarg is None
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-08-02 17:25:50 -07:00
dec29e1c10
Add support for sysctl when creating container
...
Closes #1144
Signed-off-by: Jari Takkala <jtakkala@gmail.com>
2016-08-01 23:43:52 +01:00
723d144db5
Add support for IPv6 docker host connections.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-27 18:42:14 -07:00
0e68b0a429
Default to npipe address on Windows
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-26 11:39:09 +01:00
cea7376086
Send LinkLocalIPs as part of IPAMConfig dictionary
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-25 15:04:04 -07:00
1294d3c410
Add unit tests
...
Signed-off-by: Keerthan Reddy Mala <kmala@deis.com>
2016-07-22 10:04:32 -06:00
bd73225e14
Set custom user agent on client
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-20 15:04:54 -07:00
267021e453
Rename read methods for clarity
...
read_socket() is now just read(), because its behaviour is consistent
with `os.read` et al.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 18:58:57 -04:00
9fb2caecb9
Rename next_packet_size to next_frame_size
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:08:17 -04:00
73f06e3335
Move socket-reading test helpers into docker.utils.socket
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-13 17:08:17 -04:00
e64ba8f2b9
Mock read_from_socket method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-13 17:08:17 -04:00
76ed9c37cd
Read from socket after sending TCP upgrade headers.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-13 17:08:17 -04:00
5464cf2bea
Add hijack hints for non-detached exec api calls
...
Signed-off-by: David Gageot <david@gageot.net>
2016-07-13 17:08:17 -04:00
8f8a3d0ed2
volumes,create: support adding labels
...
Fixes #1102
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-07-13 08:41:45 +02:00
e8ea79dfdb
Change double underscore in test case names for _set_auth_headers
...
* Change test__set_auth_headers_* methods to test_set_auth_headers_*
Signed-off-by: Justin Michalicek <jmichalicek@gmail.com>
2016-07-12 10:06:34 -04:00
f7807bdb52
Update build unit tests
...
* Test that the request from build when the client has
auth configs contains the correct X-Registry-Config header
* Test that BuildApiMixin._set_auth_headers() updates the passed
in headers dict with auth data from the client
* Test that BuildApiMixin._set_auth_headers() leaves headers dict intact
when there is no _auth_config on the client.
Signed-off-by: Justin Michalicek <jmichalicek@gmail.com>
2016-07-12 10:06:34 -04:00
b5d3556bce
Added support for user namespace.
...
Signed-off-by: Srikalyan Swayampakula <srikalyansswayam@gmail.com>
2016-06-30 15:25:17 -07:00
d96d848bb4
Add integration tests for different types of kill signals
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-28 12:03:44 -07:00
1132368be1
Fix network aliases test with Engine 1.12
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-28 11:05:01 -07:00
538a1db9dd
Merge pull request #1066 from yunzhu-li/blkio-control
...
Add support for Block IO constraints in HostConfig
2016-06-15 14:26:49 -07:00
787f3f5a16
Merge pull request #1079 from docker/1024-npipe-support
...
npipe support
2016-06-14 12:05:35 -07:00
b6fa986293
Add ipv[46]_address params to create_endpoint_config.
...
Update networks documentation with exhaustive API docs
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 17:58:10 -07:00
86d1b8fb83
invoke self._result with json=True if decode=True
...
Signed-off-by: Massimiliano Pippi <massi@datadoghq.com>
2016-06-07 10:32:02 -04:00
896d36ea1d
Add support for Block IO constraints in HostConfig
...
This adds support for Block IO constraint options:
- blkio-weight
- blkio-weight-device
- device-read-bps
- device-write-bps
- device-read-iops
- device-write-iops
Signed-off-by: yunzhu-li <contact@yunzhu.li>
2016-06-05 23:30:44 -04:00
0176fa171f
Update parse_host and tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-02 18:21:29 -07:00
e0b9cb2a8c
support Python 3.5
...
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
2016-05-19 17:59:34 +01:00
98b41fee3c
Add support for creating internal networks
...
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
2016-05-18 16:25:43 +02:00
5ebf4b8ec7
Resolve path traversal in .dockerignore patterns
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-05-16 15:55:06 +01:00
2826dd51e7
Don't set socket timeout if it's already disabled when streaming
...
Signed-off-by: Kevin Frommelt <kevin.frommelt@gmail.com>
2016-05-10 10:23:14 -05:00
3c02fc4cc7
Merge pull request #1004 from klj613/allow-equals-character-in-env-file
...
makes it possible to have '=' in the env file
2016-04-27 16:27:28 -07:00
9da5493135
Use backports.ssl_match_hostname
...
The py2-ipaddress module unfortunately conflicts with the pypi:ipaddress module, which is in the dependency tree of widely used pyOpenSSL. I think it would be a good idea to use a well maintained backport of the Python 3.5 implementation of match_hostname() instead of duplicating the effort and maintain another.
All tests are passing here.
Signed-off-by: Felix Yan <felixonmars@archlinux.org>
2016-04-08 00:36:46 +08:00
541edd7ffb
Don't raise InvalidConfigError when auth dict doesn't have an 'auth' key
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-05 14:05:33 -07:00
c5a92e0822
Tests for match_hostname backport
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 17:09:26 -07:00
cf83119882
Test commit changes param
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-23 12:17:22 -07:00
9505b3e8b5
Merge branch 'master' of https://github.com/dimaspivak/docker-py into dimaspivak-master
2016-03-23 12:04:09 -07:00
14cc5806c5
Merge branch 'gferon-master'
2016-03-23 12:02:31 -07:00
7b17cfaa46
check_duplicate test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-23 12:01:56 -07:00
ec05d5d2c0
gzip build test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-23 11:23:05 -07:00
c3f76e6e8f
Merge branch 'from_env' of https://github.com/bfirsh/docker-py into bfirsh-from_env
2016-03-22 17:09:24 -07:00
7a0e19766b
Support OomScoreAdj in host configuration
...
Signed-off-by: Aditya Marella <aditya.marella@gmail.com>
2016-03-22 10:54:59 -07:00
6eaf8ce721
makes it possible to have '=' in the env file
...
note that the docker command line flag --env-file also allows '=' in the env file
Signed-off-by: Kristian Lewis Jones <klj613@kristianlewisjones.com>
2016-03-22 10:00:47 +00:00
3fe08cbfe5
Support passing an alternate environment dict to kwargs_from_env
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-21 18:17:27 -07:00
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
6fa76e01a4
Remove the network mode to support linkable cantainers check
...
Partially related to issue #21080
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-03-21 10:25:08 +08:00
3168149cbf
If tcp host is provided while TLS is enabled, convert to https
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-17 16:18:37 -07:00
41acd70fd4
Merge pull request #995 from docker/default-version-1.22
...
Update default API version to 1.22
2016-03-16 19:55:42 -07:00
5ace6204b4
Update default API version to 1.22
...
Update engine version used for integration tests
IP address configuration tests needed tweaking
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-16 17:52:39 -07:00
7417bc2cce
Don't support tmpfs in API version < 1.22
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-16 17:37:54 +00:00
4ffa1be825
Add tmpfs integration test
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-16 17:28:10 +00:00
72446b47c0
Add unittest for the Tmpfs Hostconfig option
...
Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
2016-03-16 14:47:40 +00:00
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
8e93abf271
Merge branch 'master' into tls-fixes
2016-03-15 10:35:53 -07:00
d4c17859a3
Invalid log driver error raised during create_container step
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-14 15:05:47 -07:00
ad480ff0b1
Fix enable_tls issue #984
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-11 12:27:24 -08:00
d4a5bc4a86
Add ip4&ip6 ( #935 ) support, network/id/connect
...
Signed-off-by: Matt Daue <mattdaue@gmail.com>
- Implement check to validate API ver is >= 1.22 for new feature
- Includes patch @elchris82: Changed network in data dict to IPAMConfig as needed from the API. See https://github.com/docker/docker/issues/20732
- Update unit test for container attach to net
- Update integration tests
- Add integration test for IP setting
Signed-off-by: Matt Daue <mattdaue@gmail.com>
2016-03-02 20:38:37 -05:00
81d8caaf36
Merge pull request #916 from docker/container_update_feature
...
Support for container limits update
2016-02-24 18:00:06 -08:00
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
3bad04649d
Fix env vars with empty values.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2016-02-24 15:36:21 -08:00
d9d84ce8d1
Format environment variables to match docker-cli.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2016-02-23 16:30:26 -08:00
7440603d98
Improve parse_bytes util method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 16:18:45 -08:00
a710fbf60a
Unit test for Client.update_container method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 16:18:36 -08:00
c3ba50c98d
New `update_container` method
...
Allows user to update container limits in-flight.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 16:18:36 -08:00
9ba0ddf267
Fix TLS regressions
...
- Set `verify` to the CA cert path if one has been specified, rather
than `True`
- Don't set `assert_fingerprint`
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-23 14:29:52 -08:00
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
c3a66cc599
Merge pull request #928 from docker/926-ignored_dockerfiles
...
Never exclude Dockerfile from the build context.
2016-02-09 12:52:04 -08:00
90760cfe1d
Never exclude Dockerfile from the build context.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-09 12:11:30 -08:00
dc198be26c
Don't break when parsing unknown config keys
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-09 12:08:34 -08:00
fea32eb983
Merge branch 'VolumeBind' of https://github.com/keloyang/docker-py into keloyang-VolumeBind
2016-02-08 11:36:09 -08:00
8bdaffc2e7
Merge pull request #920 from docker/ssl_version_simpler
...
Remove obsolete SSL version computation
2016-02-05 12:41:02 -08:00
387db11009
Re-write kwargs_from_env to handle TLS options better
...
This more closely matches the way the docker client interprets the
relevant environment variables. Among other things, it's now possible to
set DOCKER_TLS_VERIFY=false.
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2016-02-04 17:13:09 -08:00
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
f4b3a1bddd
create tempfile in VolumeBindTest for non-auto-creating of docker
...
Signed-off-by: yangshukui <yangshukui@huawei.com>
2016-02-04 15:49:15 +08:00
b808cc45b4
Remove obsolete SSL version computation
...
Recent versions of urllib3 (including the one packaged by requests)
will automatically reject SSLv2/3.
Additional test to check urllib3's behavior (mostly for release/packaging)
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-03 17:50:52 -08:00
bb94fe7a8c
Support unspecified protocol in base_url when using TLS
...
(assume HTTPS)
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-28 16:25:23 -08:00
403d271cc2
Raise exceptions for API errors on network connect/disconnect
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-25 18:19:32 +00:00
01a754a7f7
Support links when creating containers or connecting to networks
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-20 17:47:45 +00:00
eb1f24a1fc
Merge pull request #880 from docker/813-parse-float-bytes
...
Handle 64-bit integer values in parse_bytes
2016-01-18 14:37:34 -08:00
84a72f49e9
Add HttpHeaders support in load_config
...
Signed-off-by: Pavel Kravchenko <kpavel@il.ibm.com>
2016-01-18 14:29:31 -08:00
cd66f6c6cd
parse_bytes: Add ability to handle 64-bit integers in py2
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-18 13:53:52 -08:00
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
21a5a0a049
Normalise/fix networking API JSON keys
...
- Use CamelCase
- `auxaddresses` -> `AuxiliaryAddresses`
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 18:41:18 +00:00
d00a5bb086
Implement support for network-scoped aliases
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-14 18:19:35 +00:00
62d9964cc1
Merge pull request #818 from rmb938/patch-1
...
allow custom ipam options when creating networks
2016-01-05 12:55:45 +00:00
67a29441c4
allow custom ipam options when creating networks
...
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-04 18:57:11 -05:00
c424148853
Update docker network inspect test
...
This is based on https://github.com/docker/docker/pull/18928
Related to docker/docker#18626
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-30 10:43:02 +08:00
8b322aea2b
Don't expect non-zero exit code when stopping a container
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-12-23 13:01:05 -08:00
9deffc45a1
Merge pull request #863 from thomasboyt/fast-exclude-paths
...
Don't descend into ignored directories when building context
2015-12-16 16:59:12 +00:00
25b188440a
Treat 'index.docker.io' repo names as 'docker.io'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-12-10 12:42:54 +00:00
9b890c4540
Refactor resolve_authconfig tests
...
The structure of the fake config dictionary was not reflective of what
actual parsed config looks like.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-12-10 12:42:54 +00:00
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
bd948be7d9
Allow providing options when creating networks
...
Following the spec:
http://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#create-a-network
I have added an Options argument to create_network.
This opens up the possibility of creating isolated containers with no
internet access programmatically. We require such facilities in
https://github.com/jupyter/tmpnb/issues/187 .
Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
2015-12-10 10:29:11 +05:30
0f091747ec
Merge pull request #868 from jstewmon/config-stop-signal
...
added stop_signal to create container config
2015-12-08 12:47:31 -08:00
a49166abf2
Improve get_paths performance by not descending into ignored directories
...
Signed-off-by: Thomas Boyt <thomas@ledgerx.com>
2015-12-08 11:26:25 -05:00
e0c6ec0343
incorporate feedback
...
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-12-04 01:27:44 -06:00
e0365fcbfb
Use new methods to raise exceptions in create_host_config.
...
Added tests for the new methods.
Closes #840
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-12-03 17:19:59 -06:00
31b1b53f7f
added stop_signal to create container config
...
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
2015-12-03 14:31:51 -06:00
a9a538abaf
allow interactive exec
...
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2015-12-03 11:07:11 +01:00
55b67acb5b
tests,integration: ensure container is removed if start fails
...
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2015-12-02 09:46:02 +01:00
05fd8dfb41
fix typo filter param for `volumes`
...
https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#list-volumes
Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
2015-12-01 15:06:01 +01:00
00c0baf40f
Add tests for new cases covered by parse_repository_tag
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-24 12:16:00 -08:00
6d0e2d69d5
Update auth.resolve_repository_name
...
More relaxed version that matches the constraints imposed by the
current version of the docker daemon.
Few unit tests to verify the new cases.
Client.pull was trying to set the tag value when it wasn't supposed
to, fixed now.
utils.parse_repository_tag is simpler and supports @sha... notation
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-23 18:43:02 -08:00
73b51400a1
Fix integration-dind-ssl make task
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-18 15:41:32 -08:00
de617375f1
Move methods/classes used by all integration tests to helpers.py
...
Ensure setup_module is called at session level, making the test
suite not order dependent. Test files can be invoked independently.
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-18 15:40:54 -08:00
64eac0b71c
Wrong key name in stats test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-18 14:47:48 -08:00
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
9ed721957a
Merge pull request #832 from aebm/master
...
Fix #627
2015-11-18 14:29:00 -08:00
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
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
ac148393b1
Merge pull request #851 from docker/remove-ci-transition-files
...
Remove unused files
2015-11-12 11:51:32 -08:00
c3197dcce7
Merge pull request #850 from docker/mnowster-test-no-log-driver-specified
...
Rebased #798
2015-11-12 11:23:16 -08:00
c622ff64b9
Remove unused files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-12 11:21:37 -08:00
b0bb4ff3a4
Merge branch 'test-no-log-driver-specified' of https://github.com/mnowster/docker-py into mnowster-test-no-log-driver-specified
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-12 11:11:51 -08:00
6e73f04acc
Merge pull request #796 from v-boyko/feature/logs_since
...
Support the 'since' option in the 'containers/<id>/logs' endpoint (API upgrade)
2015-11-12 14:07:54 -05:00
c89d366827
Merge pull request #848 from docker/845-fix
...
Client.logs(tail=0) now shows no past logs (expected behavior)
2015-11-12 10:54:51 -08:00
0e13a0d7fd
Client.logs(tail=0) now shows no past logs (expected behavior)
...
Add test confirming the new behavior.
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-12 10:50:01 -08:00
fe858f5ecc
Add build integration test checking stderr shows up in stream
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-11 17:14:03 -08:00
cefad9e23b
Update buildargs test to avoid race condition
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-10 17:47:05 -08:00
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
5571d1af76
Support 'buildargs' parameter for docker 1.9.
...
Signed-off-by: Leonty Balovnev <tigreavecdesailes@gmail.com>
2015-11-10 00:23:16 +03:00
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
01353c11ca
Dont include mem_swappiness when testing use of str values
...
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-11-05 02:52:18 -06:00
c07dd53a2a
Incorporates feedback from and closes #814
...
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-11-05 02:20:53 -06:00
4f1304c108
Bump default API version to 1.21
...
Update Makefile to run tests against dind 1.9.0
Update network tests to account for latest API changes
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-04 19:32:22 +01:00
a695f0ca5a
Fix #627
...
Docker-py couldn't pull private images if the account have non ascii chars
in either user or password. It that case an exception ending with no auth
credentials.
Instead docker client (golang) don't suffer this issue.
Also add a test to check the login or password even with non ascii char have
a valid auth dictionary
Signed-off-by: Alejandro Brito Monedero <abrito@alea-soluciones.com>
2015-10-29 16:12:30 +01:00
47ab89ec2b
Merge pull request #830 from docker/fix-links-create-test
...
Use network_mode=bridge when testing links
2015-10-28 16:36:34 +01:00
aaeb6c1087
Use network_mode=bridge when testing links
...
Links are only compatible with network mode bridge.
New versions of docker only create env entries when network mode
is properly set.
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-28 14:52:17 +01:00
f4c881f37d
Merge pull request #827 from coreypobrien/lessbinding
...
Move container volume bind tests to their own class
2015-10-28 11:07:35 +01:00
a2184def6e
Move container volume bind tests to their own class
...
Signed-off-by: Corey O'Brien <coreypobrien@gmail.com>
2015-10-27 16:08:58 -05:00
a610a1be0e
Fix py3.2 test failure and unicode behavior
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-27 18:01:19 +01:00
311ae711d4
Merge pull request #825 from aebm/master
...
Fix auth.load_config bug calling parse_auth
2015-10-27 15:57:00 +01:00
22da6ace7a
Fix auth.load_config bug calling parse_auth
...
When load_config found and auths section it didn't call parse_auth only with
the auths section. Instead it called parse_auth with all the configuration.
There is also a test to check this case
Signed-off-by: Alejandro Brito Monedero <alejandro.monedero@gmail.com>
2015-10-27 09:03:28 +01:00
417c80057b
Support unicode commands.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-10-26 17:22:14 -04:00
Joffrey F
Joffrey F
Olivier Sallou
Chris Mark
Bryan Boreham
grahamlyons
Madhuri Kumari
kaiyou
Chris Ottinger
allencloud
Yong Wen Chua
Aaron Cowdin
Dan Liew
Tomas Tomecek
Alexey Rokhin
Rob Kooper
Frank Sachsenheim
alex-dr
Lei Gong
Tomasz Madycki
Boaz Shuster
Damien Nadé
crierr
Nils Krabshuis
Ben Firshman
Thomas Schaaf
Alejandro E. Brito Monedero
Dmitri
Flavio Curella
徐俊杰
Daniel Nephin
Aanand Prasad
Stepan Stipl
Jon Cotton
Brandon Bodnar
Jamie Greeff
Simon Li
Ryan Belgrave
Alessandro Boch
Walker Lee
Maxime Feron
Nathan Shirlberg
fermayo
Kay Yan
Brian Goff
Josh Purvis
George Lester
Jari Takkala
Keerthan Reddy Mala
David Gageot
Justin Michalicek
Srikalyan Swayampakula
Massimiliano Pippi
yunzhu-li
Thomas Grainger
Jonathan Giannuzzi
Kevin Frommelt
Felix Yan
Aditya Marella
Kristian Lewis Jones
Dima Spivak
wenchma
Jan Losinski
Matt Daue
Stéphane Seguin
Mike Dougherty
Spencer Rinehart
yangshukui
Pavel Kravchenko
Ryan Belgrave
Sumit Sahrawat
Thomas Boyt
Dustin Falgout
Jonathan Stewmon
Nicolas Delaby
Michael Schubert
Leonty
Viacheslav Boiko
Corey O'Brien