Ben Firshman
cd267d5121
Add user agent to API calls
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-27 16:27:05 +01:00
Aanand Prasad
f9c5816ab8
Stop checking the deprecated DOCKER_CLIENT_TIMEOUT variable
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
Joffrey F
e7a8b2fed5
Update TLS version configuration code. Tests.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-03 11:45:22 -07:00
Joffrey F
78a8be07ad
Re-enabling assert_hostname when instantiating docker_client from the
...
environment.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-30 11:11:19 -07:00
Joffrey F
71c86acaa4
Update docker-py version to include match_hostname fix
...
Removed unnecessary assert_hostname computation in tls_config_from_options
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 18:01:27 -07:00
Joffrey F
7116aefe43
Fix assert_hostname logic in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-28 17:39:20 -07:00
Joffrey F
b99037b4a6
Add support for DOCKER_* variables in .env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
Joffrey F
2cc87555cb
tls_config_from_options unit tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:57:45 -07:00
Joffrey F
442dff72b4
Improve assert_hostname setting in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
Joffrey F
26f3861791
Specifying --tls no longer overrides all other TLS options
...
Add an option to skip hostname verification
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
Joffrey F
7166408d2a
Fixed typos + simplified TLSConfig creation process.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
Joffrey F
1ac33ea7e5
Add support for TLS config command-line options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
Kalle Møller
7fc40dd7cc
Adding ssl_version to docker_clients kwargs
...
Select tls version based of COMPOSE_TLS_VERSION
Changed from SSL to TLS
Also did docs - missing default value
Using getattr and raises AttributeError in case of unsupported version
Signed-off-by: Kalle Møller <github.com@k-moeller.dk>
2016-03-19 01:15:03 +01:00
Daniel Nephin
57fc85b457
Wrap long lines and restrict lines to 105 characters.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 19:05:39 -05:00
Aanand Prasad
9ccef1ea91
Catch TLSParameterErrors from docker-py
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 21:48:12 +00:00
Aanand Prasad
9e17cff0ef
Refactor API version switching logic
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-12 21:29:45 +00:00
Daniel Nephin
475a091768
Update pre-commit config to enforace that future imports exist in all files.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-07 13:09:03 -05:00
Joffrey F
b4be7b870f
Add support for declaring named volumes in compose files
...
* Bump default API version to 1.21 (required for named volume management)
* Introduce new, versioned compose file format while maintaining support
for current (legacy) format
* Test updates to reflect changes made to the internal API
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-05 15:09:39 -08:00
Daniel Nephin
73de81b51c
Upgrade tests to use new Mounts in container inspect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-05 15:09:39 -08:00
Daniel Nephin
e2f792c4f4
If -x-networking is used, set the correct API version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 12:09:50 -04:00
Aanand Prasad
e5eaf68490
Remove custom docker client initialization logic
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-21 15:27:42 +01:00
Joffrey F
f9c7346380
HTTP_TIMEOUT as importable constant for consistency
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 16:29:19 -07:00
Joffrey F
e634fe3fd6
Deprecation warning when DOCKER_CLIENT_TIMEOUT is used
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 14:28:57 -07:00
Joffrey F
b54b932b54
Exit gracefully when requests encounter a ReadTimeout exception.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 11:54:20 -07:00
Daniel Nephin
59d4f304ee
Run pre-commit on all files
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-24 17:04:50 -04:00
Aanand Prasad
118a389646
Update API version to 1.19
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 15:44:21 +01:00
Reilly Herrewig-Pope
fc203d643a
Allow API version specification via env var
...
Hard-coding the API version to '1.18' with the docker-py constructor will
cause the docker-py logic at
https://github.com/docker/docker-py/blob/master/docker/client.py#L143-L146
to always fail, which will cause authentication issues if you're using a
remote daemon using API version 1.19 - regardless of the API version of
the registry.
Allow the user to set the API version via an environment variable. If
the variable is not present, it will still default to '1.18' like it
does today.
Signed-off-by: Reilly Herrewig-Pope <reilly.herrewigpope@mandiant.com>
2015-07-29 08:44:47 -04:00
Aanand Prasad
2e6bc078fb
Implement 'labels' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-29 16:45:18 +01:00
Kyle Walker
d17c4d27fa
Support alternate Dockerfile name.
...
Signed-off-by: Kyle James Walker <KyleJamesWalker@gmail.com>
2015-04-24 08:30:36 -07:00
Aanand Prasad
965426e39b
Revert "Add 'labels:' config option"
...
This reverts commit 721327110d
.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-23 15:04:04 -07:00
Aanand Prasad
721327110d
Add 'labels:' config option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 18:12:04 -07:00
Aanand Prasad
eef4bc3917
Specify all HostConfig at create time
...
This is required for Swarm integration: the cluster needs to know
about config like `links` and `volumes_from` at create time so that it
can co-schedule containers.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:14:07 -07:00
Aanand Prasad
2af7693e64
WIP: rename Fig to Compose
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:00:23 +00:00