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

450 Commits

Author SHA1 Message Date
Ben Firshman 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
Joffrey F 8e93abf271 Merge branch 'master' into tls-fixes 2016-03-15 10:35:53 -07:00
Joffrey F 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
Joffrey F ad480ff0b1 Fix enable_tls issue #984 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-11 12:27:24 -08:00
Matt Daue 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
Joffrey F 81d8caaf36 Merge pull request #916 from docker/container_update_feature 
Support for container limits update
 2016-02-24 18:00:06 -08:00
Joffrey F 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
Daniel Nephin 3bad04649d Fix env vars with empty values. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2016-02-24 15:36:21 -08:00
Daniel Nephin d9d84ce8d1 Format environment variables to match docker-cli. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2016-02-23 16:30:26 -08:00
Joffrey F 7440603d98 Improve parse_bytes util method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 16:18:45 -08:00
Joffrey F a710fbf60a Unit test for Client.update_container method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-23 16:18:36 -08:00
Joffrey F 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
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
Stéphane Seguin 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
Joffrey F 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
Joffrey F 90760cfe1d Never exclude Dockerfile from the build context. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-09 12:11:30 -08:00
Joffrey F 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
Joffrey F fea32eb983 Merge branch 'VolumeBind' of https://github.com/keloyang/docker-py into keloyang-VolumeBind 2016-02-08 11:36:09 -08:00
Joffrey F 8bdaffc2e7 Merge pull request #920 from docker/ssl_version_simpler 
Remove obsolete SSL version computation
 2016-02-05 12:41:02 -08:00
Mike Dougherty 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
Spencer Rinehart 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
yangshukui 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
Joffrey F 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
Joffrey F 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
Aanand Prasad 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
Aanand Prasad 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
Joffrey F 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
Pavel Kravchenko 84a72f49e9 Add HttpHeaders support in load_config 
Signed-off-by: Pavel Kravchenko <kpavel@il.ibm.com>
 2016-01-18 14:29:31 -08:00
Joffrey F 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
Joffrey F 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
Aanand Prasad 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
Aanand Prasad d00a5bb086 Implement support for network-scoped aliases 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-14 18:19:35 +00:00
Aanand Prasad 62d9964cc1 Merge pull request #818 from rmb938/patch-1 
allow custom ipam options when creating networks
 2016-01-05 12:55:45 +00:00
Ryan Belgrave 67a29441c4 allow custom ipam options when creating networks 
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
 2016-01-04 18:57:11 -05:00
wenchma 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
Joffrey F 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
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad 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
Sumit Sahrawat 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
Sumit Sahrawat 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
Joffrey F 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
Thomas Boyt 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
Dustin Falgout e0c6ec0343 incorporate feedback 
Signed-off-by: Dustin Falgout <dustin@falgout.us>
 2015-12-04 01:27:44 -06:00
Dustin Falgout 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
Jonathan Stewmon 31b1b53f7f added stop_signal to create container config 
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
 2015-12-03 14:31:51 -06:00
Tomas Tomecek a9a538abaf allow interactive exec 
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2015-12-03 11:07:11 +01:00
Tomas Tomecek 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
Nicolas Delaby 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
Joffrey F 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