Commit Graph

1882 Commits

Author SHA1 Message Date
Joffrey F 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
Joffrey F 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
Joffrey F 32cd0161b6 Merge pull request #1330 from docker/walkerlee-master
Add options to IPAMConfig
2016-12-02 15:18:41 -08:00
Joffrey F fbc9f9b5e9 Merge pull request #1327 from docker/compose4171_build_auth_headers
Properly fill out auth headers in APIClient.build when using a credstore
2016-12-02 15:08:48 -08:00
Joffrey F 3fe014475c Merge pull request #1329 from docker/manics-patch-1
Use format_environment to convert env in ContainerSpec
2016-12-02 15:08:27 -08:00
Joffrey F 1d59aeca4b Add options to IPAMConfig
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-02 15:04:05 -08:00
Joffrey F 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
Joffrey F 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
Joffrey F 9f2f93de0e Merge pull request #1324 from docker/requests_2.12.2
Exclude requests==2.12.2 from dependencies
2016-12-02 11:27:03 -08:00
Aanand Prasad 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
Ben Firshman dfa4b76989 Merge pull request #1328 from docker/ssladapter_transport_module
Move ssladapter to transport module
2016-12-02 14:44:03 +00:00
Ben Firshman ff6601cf64 Merge pull request #1319 from docker/config_types
Move config type creation from docker.utils functions to classes in docker.types
2016-12-02 14:35:43 +00:00
Joffrey F 4539644667 Move ssladapter to transport module
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-01 18:04:40 -08:00
Joffrey F d042c6aeda Properly fill out auth headers in APIClient.build when using
a credentials store

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-01 18:04:15 -08:00
Joffrey F 01c33c0f68 Client -> DockerClient
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-01 18:02:16 -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 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
Joffrey F 239673a51c Merge pull request #1308 from docker/docker_client
Rename Client -> DockerClient
2016-11-30 15:30:40 -08:00
Joffrey F 176346bd95 Exclude requests==2.12.2 from dependencies
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-30 15:23: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 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
Joffrey F 52376e4b24 Merge pull request #1250 from mmerickel/fix/1211
do not assume that read will consume the number of bytes requested
2016-11-28 14:00:32 -08: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 75e9d357f7 Merge pull request #1309 from bfirsh/remove-maintainer-from-dockerfiles
Remove MAINTAINER from Dockerfiles
2016-11-28 13:14:40 -08:00
Joffrey F 115f39e96e Merge pull request #1316 from bfirsh/add-example-for-tag
Add example for tag()
2016-11-28 13:14:02 -08:00
Joffrey F 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
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
Aanand Prasad 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
Stepan Stipl 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
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
Ben Firshman 29215a0ad9
Add example for tag()
Carrying #1120. Thanks @Faylixe!

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 19:38:29 +00:00
Joffrey F f051f7e90a Merge pull request #1314 from bfirsh/specify-encoding-for-readme
Specify encoding when loading readme
2016-11-28 11:33:43 -08:00
Michael Merickel dbd704e68d do not assume that read will consume the number of bytes requested
The issue is that ``os.read`` does not always read the expected number of
bytes, and thus we are moving to the next frame too early causing drift
in the byte stream. When the reading drifts, it starts reading garbage
as the next frame size. The some examples of frame sizes were
4032897957 bytes, etc. Values this large were causing the exceptions
from ``os.read``.

fixes #1211

Signed-off-by: Michael Merickel <michael@merickel.org>
2016-11-28 13:31:12 -06:00
Joffrey F f36c28926c Merge pull request #1305 from bfirsh/update-setup-py
Update setup.py and things
2016-11-28 11:29:42 -08:00
Ben Firshman 3518c9f631 Merge pull request #822 from docker/no_start_config
Remove support for host_config in Client.start
2016-11-28 19:05:09 +00:00
Joffrey F 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
Ben Firshman 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
Ben Firshman fc9f7e2b2f
Bump version to 2.0.0-dev
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 15:11:01 +00:00
Ben Firshman 6d770a65d7
Use find_packages in setup.py
It was missing docker.models, and this will fix it forever more.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 15:11:01 +00:00
Ben Firshman 04e9437986
Update setup.py details
Move from "docker-py" package to "docker".

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 15:11:01 +00:00
Ben Firshman e04c4ad83f
Update readme to say "Docker Engine API"
It's not the Docker API.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 15:10:58 +00:00
Aanand Prasad 4c8c761bc1 Merge pull request #1307 from docker/bfirsh_maintainer
Add Ben to MAINTAINERS
2016-11-28 14:45:34 +00:00
Ben Firshman a658e14e8b
Specify encoding when loading readme
Loading readme fails when system locale is not utf-8.

Potentially replaces #1313

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 14:38:38 +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
Brandon Bodnar e2eb4a3158 Prevent traversing excluded directories with no possible dockerignore exceptions
Fixes an issue where all files in a rather large excluded folder are traversed and examined when creating the build context for potential exception to the exclusion, even though the exclusion rule is for a completely unrelated folder.

Signed-off-by: Brandon Bodnar <bodnarbm@gmail.com>
2016-11-26 21:17:18 -05:00
Ben Firshman 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
Joffrey F 037ead974b Add Ben to MAINTAINERS
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-23 11:37:33 -08:00
Joffrey F c66c7f8b0a Merge pull request #1306 from bfirsh/mmmmmm-vector-graphics
Use SVG for build status badge
2016-11-23 11:30:20 -08:00
Joffrey F 30f3a0299e Merge pull request #1304 from bfirsh/fix-documentation-link
Fix documentation link in readme
2016-11-23 11:28:52 -08:00
Ben Firshman af67add683
Add warning about development version to readme
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-23 18:07:33 +00:00