docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,182 Commits 23 Branches 129 Tags 8.9 MiB
Commit Graph

191 Commits

Author SHA1 Message Date
Matthew Berry a23cd3d8e8 Fix #1673 check resource error in container network API 
Container network functions checked 'image' as resource ID and not
'container'.  This caused a traceback when using container as named
argument.

Signed-off-by: Matthew Berry <mtberry89@gmail.com>
 2017-08-17 13:38:40 -07:00
Joffrey F 50a60717f0 split_port should not break when passed a non-string argument 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-28 12:22:34 -07:00
Joffrey F 320c810471 Support credHelpers section in config.json 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-22 11:51:31 -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
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
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
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
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 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 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
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 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
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 f387ae46d7 Merge pull request #1467 from crierr/master 
Allow port range like 8000-8010:80
 2017-02-22 15:27:42 -08:00
Joffrey F 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
Damien Nadé 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
crierr cfc11515bc Allow port range like 8000-8010:80 
Signed-off-by: SeungJin Oh <crierr@naver.com>
 2017-02-20 02:09:33 +09:00
Nils Krabshuis 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
Joffrey F afcbeb5e4f Merge pull request #1449 from shin-/secrets-api 
Implement secrets API
 2017-02-15 18:08:25 -08:00
Joffrey F 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
Joffrey F e8a86e40cc Add tests for secret API implementation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-13 17:06:25 -08:00
Ben Firshman 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
Ben Firshman 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
Joffrey F 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
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
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