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

67 Commits

Author SHA1 Message Date
Joffrey F a05922e949
Merge pull request #1881 from docker/pytest-asserts 
Use pytest asserts
 2018-01-30 16:29:07 -08:00
Joffrey F 3422211309 Use pytest asserts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-30 14:26:24 -08:00
Joffrey F 4e34300379 Do not break when archiving broken symlinks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-29 18:27:12 -08:00
Veli-Matti Lintu fc6773d673 Commit d798afca made changes for the handling of '**' patterns in 
.dockerignore. This causes an IndexError with patterns ending
with '**', e.g. 'subdir/**'. This adds a missing boundary check
before checking for trailing '/'.

Signed-off-by: Veli-Matti Lintu <veli-matti.lintu@nosto.com>
 2017-08-22 17:00:11 -07:00
Joffrey F 7f5739dc02 Leading slash in .dockerignore should be ignored 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-17 13:38:40 -07:00
Jakub Goszczurny bf9d06db25 Generating regexp from .dockerignore file in a similar way as docker-ce. 
Signed-off-by: Jakub Goszczurny <szczurmys@o2.pl>
 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
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 73d8097b3d Fix test issues 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-29 15:39:48 -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
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
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
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 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 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
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 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 9643253c50 Merge pull request #1297 from docker/stepanstipl-allow_custom_pid_mode 
Allow custom pid mode
 2016-11-28 14:00:07 -08:00
Joffrey F 44e57fb95d Re-enable pid_mode checks for API < 1.24 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-28 12:01:25 -08:00
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
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 9daa320454
Rename Client to APIClient 
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
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
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
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 902c7a76cc Docs and tests for pids_limit. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-23 17:05:08 -07:00
Kay Yan fc72ac66e9 support MemoryReservation and KernelMemory 
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
 2016-08-23 15:32:06 -07:00
Joffrey F 797f1edc20 Merge branch 'master' of https://github.com/srikalyan/docker-py into srikalyan-master 2016-08-23 15:16:15 -07:00
George Lester 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
Joffrey F 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
Joffrey F 723d144db5 Add support for IPv6 docker host connections. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 18:42:14 -07:00
Aanand Prasad 0e68b0a429 Default to npipe address on Windows 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-26 11:39:09 +01:00
Srikalyan Swayampakula b5d3556bce Added support for user namespace. 
Signed-off-by: Srikalyan Swayampakula <srikalyansswayam@gmail.com>
 2016-06-30 15:25:17 -07:00
Joffrey F 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
yunzhu-li 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
Joffrey F 0176fa171f Update parse_host and tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-02 18:21:29 -07:00
Thomas Grainger e0b9cb2a8c
support Python 3.5 
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
 2016-05-19 17:59:34 +01:00
Aanand Prasad 5ebf4b8ec7 Resolve path traversal in .dockerignore patterns 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-16 15:55:06 +01:00
Joffrey F 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
Joffrey F c5a92e0822 Tests for match_hostname backport 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-29 17:09:26 -07:00
Aditya Marella 7a0e19766b Support OomScoreAdj in host configuration 
Signed-off-by: Aditya Marella <aditya.marella@gmail.com>
 2016-03-22 10:54:59 -07:00
Kristian Lewis Jones 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
Joffrey F 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
Joffrey F 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
Joffrey F ad480ff0b1 Fix enable_tls issue #984 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-11 12:27:24 -08:00
Aanand Prasad 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