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
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
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
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
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
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
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
Ben Firshman
b5f7d380d0
Add helpful error for APIClient methods on Client
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:05:43 +00:00
Ben Firshman
1984f68730
Add new user-focused API
...
See #1086
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:05:43 +00:00
Ben Firshman
d98a879016
Add random_name test helper
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman
6334312e47
Split out base integration test for APIClient
...
So the cleanup stuff can be reused for model tests.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman
39900c558c
Move APIClient tests into single file
...
For some reason this was spread across two files.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00:00
Ben Firshman
e055a1c813
Rename DockerClientTest to BaseAPIClientTest
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:04 +00: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
c7903f084e
Remove AutoVersionClient
...
Just do Client(version='auto').
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
Ben Firshman
19eefcf705
Make docker.ssladaptor a single file
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 17:03:03 +00:00
Ben Firshman
2c9d1110f0
Make docker.auth a single file
...
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
Aanand Prasad
e4b6d0dca6
Convert dicts to Healthcheck objects, string commands to CMD-SHELL lists
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:04:17 +00:00
Aanand Prasad
6bb7844ab3
Rework healthcheck integration test
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:04:17 +00:00
Jamie Greeff
b4f2b5fa70
Add support for passing healthcheck to create_container
...
Signed-off-by: Jamie Greeff <jamie@greeff.me>
2016-11-16 16:04:17 +00:00
Joffrey F
f262dd6da9
Merge pull request #1281 from TomasTomecek/1265-ssl-test-no-sslX-support-in-openssl
...
ssl,test: OpenSSL may not support ssl2
2016-11-14 12:02:55 -08:00
Aanand Prasad
c66c2d6fa5
Fix linting error
...
This seems to have been ignored by older versions of flake8, and fixed
in version 3.1.0 or 3.1.1.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-14 18:20:13 +00:00
Tomas Tomecek
9a485b30ee
ssl,test: OpenSSL may not support ssl2
...
Fixes #1265
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-11-14 09:05:26 +01:00
Ryan Belgrave
98e2e1fcd6
Add labels and shmsize arguments to the image build
...
Signed-off-by: Ryan Belgrave <Ryan.Belgrave@target.com>
2016-11-08 09:45:32 -06:00
Ben Firshman
3c7c231983
Fix broken unit test
...
Introduced by https://github.com/docker/docker-py/pull/1230
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-07 12:20:20 -08:00
Joffrey F
f745c8e7c5
Merge pull request #1230 from LabattFoodService/updateNode
...
enable setting of node labels #1225
2016-11-07 10:47:55 -08:00
Joffrey F
be2ae8df36
WIP
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-04 15:10:12 -07:00
Alessandro Boch
54586053b1
Changes for service tests to pass in docker master
...
- update config structure has new members
- service name update is no longer supported
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-01 16:56:37 -07:00
Joffrey F
9b35c74f0e
Fix dockerignore exclusion logic on Windows
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-14 16:02:28 -07: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
Ben Firshman
69e992ec48
Move requires_api_version to helpers
...
Because it's a helper, not a base thing. In preparation for
moving/deleting the unit test base classes.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-03 11:58:08 +01:00
Ben Firshman
7339d77043
Move BaseTestCase to BaseIntegrationTest
...
Because two things called `BaseTestCase` is quite confusing.
I haven't bothered refactoring the other `BaseTestCase` because
that disappears anyway when we drop Python 2.6 support.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-10-03 11:58:08 +01: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
2b34e0b8e4
Merge pull request #1224 from mferon/addRestartPolicyUpdateSupport
...
Add support for restart policy update
2016-09-29 14:53:53 -07:00
Alessandro Boch
a864059b83
Adjust test_create_network_with_ipam_config
...
- to account for API change: IPAM class will now
also include a Data class, besides Config.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-29 09:49:58 -07:00
Maxime Feron
a665c8c443
Add support for restart policy update
...
Signed-off-by: Maxime Feron <maxime.feron@corp.ovh.com>
2016-09-28 10:21:59 +02:00
Nathan Shirlberg
6ef14932d0
enable setting of node labels #1225
...
Added update_node function to enable setting labels on nodes. This
exposes the Update a Node function from the Docker API and should
enable promoting/demoting manager nodes inside a swarm.
Signed-off-by: Nathan Shirlberg <nshirlberg@labattfood.com>
2016-09-27 11:26:26 -05:00
Joffrey F
1e939be5fb
Merge pull request #1210 from docker/identity-token-support
...
Add support for identity tokens in config file
2016-09-16 11:47:48 -07:00
Joffrey F
d731a4315c
Add support for identity tokens in config file.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-15 14:28:09 -07:00
Joffrey F
9141e9496d
Merge pull request #1215 from bfirsh/autopep8
...
Fix a few pep8 issues
2016-09-14 14:08:13 -07:00
Joffrey F
89afee94fd
Merge pull request #1213 from bfirsh/parse-json-errors
...
Parse JSON API errors
2016-09-14 11:09:55 -07:00
Ben Firshman
6220636536
Fix a few pep8 issues
...
autopep8 --in-place --recursive --experimental -aaa --ignore E309 .
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-09-14 16:54:54 +01:00