Commit Graph

713 Commits

Author SHA1 Message Date
Joffrey F 2086c20ce1 Merge pull request #1631 from madhuri-rai07/master
Add support for ``runtime`` config
2017-06-16 12:05:15 -07:00
Joffrey F 87d5cd1b0a Merge pull request #1632 from kaiyou/master
allow ipv6 :: notation in split_port (using re)
2017-06-16 11:57:52 -07:00
Joffrey F 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
Olivier Sallou 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
Chris Mark 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
Joffrey F 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
Bryan Boreham 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
grahamlyons 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
Madhuri Kumari 612c0f3d0d Fix test cases for ``runtime`` config
Signed-off-by: Madhuri Kumari <madhuri.kumari@intel.com>
2017-06-07 10:47:27 +05:30
kaiyou 0c1271350d Add a specific unit test for splitting port with IPv6
The test was copied from ccec87ca2c

Signed-off-by: kaiyou <pierre@jaury.eu>
2017-06-05 18:21:33 +02:00
Madhuri Kumari 6ae24b9e60 Add support for ``runtime`` in container create and run API 2017-06-01 15:09:46 +00:00
allencloud 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
Joffrey F 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
Joffrey F 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
Yong Wen Chua 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
Joffrey F 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
allencloud 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
Joffrey F 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
Joffrey F 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
Joffrey F bf60e2a330 init_path removed in Engine 17.05
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-09 16:16:10 -07:00
Joffrey F 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
Joffrey F f27ecf3f88 Add ContainerSpec mounts test
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-08 14:13:59 -07:00
Joffrey F 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
Joffrey F c6030027f5 Modernize exec_api.py
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-02 17:09:09 -07:00
Aaron Cowdin 7dffc46234 Add integration tests
Signed-off-by: Aaron Cowdin <aaron.cowdin@gmail.com>
2017-05-02 17:01:34 -07:00
Joffrey F 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
Dan Liew 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
Dan Liew 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
Tomas Tomecek 4633dac580 exec: add support for `Env`
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2017-04-29 08:56:51 +02:00
Joffrey F 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
Alexey Rokhin 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
Joffrey F d19572aae3 Merge pull request #1493 from funkyfuture/model_properties
Adds a few model properties
2017-04-27 16:21:02 -07:00
Rob Kooper 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
Alexey Rokhin 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
Frank Sachsenheim 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
Frank Sachsenheim 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
Frank Sachsenheim 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
Joffrey F 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
Joffrey F 73d8097b3d Fix test issues
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-29 15:39:48 -07:00
Joffrey F c5d35026ce Set infinite timeout for the `events` method
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-27 15:57:36 -07:00
Joffrey F 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
alex-dr 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
Joffrey F 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
Joffrey F daac15c1fa Add service_logs integration test
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-13 17:29:04 -07:00
Joffrey F 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
Joffrey F c2d114c067 Move LinksTest to appropriate file
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-09 16:12:22 -08:00
Lei Gong 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
Joffrey F fa52824363 Merge pull request #1481 from shin-/system_df
Add df method
2017-03-06 11:08:41 -08:00
Joffrey F 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
Tomasz Madycki 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