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

2814 Commits

Author SHA1 Message Date
Ian Campbell d38c7246a4
Merge pull request #2287 from hannseman/swarm-default-addr-pool-redux 
Redux added arguments to create a swarm with a custom address pool and subnet size.
 2019-03-25 12:01:15 +00:00
Ian Campbell 5abf671442
Merge pull request #2282 from ulyssessouza/avoid-race-condition-on-autoremove 
Avoid race condition on short execution
 2019-03-25 12:00:28 +00:00
Ulysses Souza 8f42dd1484 Avoid race condition on short execution 
- Add a sleep of 2 seconds to be sure the logs
can be requested before the daemon removes the
container when run with auto_remove=True

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-25 12:42:54 +01:00
Ulysses Souza d47e5aaa9a
Merge pull request #2281 from hannseman/sctp-protocol 
Support for SCTP
 2019-03-25 12:04:41 +01:00
Joffrey F 565489e2d0
Merge pull request #2265 from lekster/master 
set buildargs default value if None
 2019-03-23 13:44:30 -07:00
Hannes Ljungberg 68a271cef4 Fix documentation and order of arguments 
Following https://github.com/docker/docker-py/pull/2201#pullrequestreview-192571911

Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
Co-authored-by: Hannes Ljungberg <hannes@5monkeys.se>
Co-authored-by: bluikko <14869000+bluikko@users.noreply.github.com>
 2019-03-22 20:30:17 +01:00
Barry Shapira d6cc972cd9 Split monolithic integration tests into individual tests. 
The integration tests require restarting the swarm once for each
test.  I had done so manually with self.init_swarm(force_new_cluster=True)
but that wasn't resetting the swarm state correctly.  The usual
test teardown procedure cleans up correctly.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
 2019-03-22 10:40:27 +01:00
Barry Shapira 781dc30ad4 Check API version before setting swarm addr pool. 
Also corrected a documentation error: the default API version from
constants is currently 1.35, not 1.30 as was sometimes listed.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>

Removed accidental whitespace.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
 2019-03-22 10:40:27 +01:00
Barry Shapira 5d69a0a62e Added arguments to creeate a swarm with a custom address pool and subnet size. 
Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
 2019-03-22 10:38:13 +01:00
Chris Crone 142db4b3d3
Merge pull request #2284 from ulyssessouza/master 
Update changelog and next milestone
 2019-03-20 15:27:32 +01:00
Ulysses Souza 7df248a2dd Update changelog and next milestone 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-20 15:06:15 +01:00
Djordje Lukic cb8b462605
Merge pull request #2283 from ulyssessouza/3.7.1-release 
3.7.1 release
 2019-03-20 13:49:36 +01:00
Ulysses Souza 963818a4d2 Bump 3.7.1 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-20 11:56:24 +01:00
Ulysses Souza 89485bf26e Fix BaseHTTPAdapter for the SSL case 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-20 11:54:23 +01:00
Ulysses Souza 313f736488 Homogenize adapters close() behaviour. 
- Adds a BaseHTTPAdapter with a close method to ensure that the
pools is clean on close()
- Makes SSHHTTPAdapter reopen a closed connection when needed
like the others

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-20 11:54:13 +01:00
Ulysses Souza e577f5d61d Sets a different default number of pools to SSH 
This is because default the number of connections
in OpenSSH is 10

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-20 11:54:00 +01:00
Yincen Xia 729c2e7830 Update doc for container.exec_run & exec_api about demux 
Signed-off-by: Yincen Xia <philip980507@msn.cn>
 2019-03-19 15:11:49 +01:00
Ulysses Souza 0f7af860d8 Fix BaseHTTPAdapter for the SSL case 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-19 11:05:56 +01:00
Hannes Ljungberg 7143cf02ab Test port lookup with protocols 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-03-18 22:15:49 +01:00
Hannes Ljungberg 35714c46b1 Test all split_port with all valid protocols 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-03-18 22:15:45 +01:00
Hannes Ljungberg 5d76e8e13e Support sctp as protocol 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-03-18 22:15:40 +01:00
Joffrey F 1047376f0d
Merge pull request #2272 from hannseman/update-service-response 
Return API response on service update
 2019-03-16 22:34:05 -07:00
Joffrey F e0024b5b3f
Merge pull request #2203 from docker/terminate_3.3_support 
[4.0] Terminate support for Python 3.3 (EOL in 2018)
 2019-03-16 11:54:40 -07:00
Joffrey F 55ffb761bf Terminate support for Python 3.3 (EOL in 2018) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-03-16 09:41:38 -07:00
Ulysses Souza 4d7d408413 Homogenize adapters close() behaviour. 
- Adds a BaseHTTPAdapter with a close method to ensure that the
pools is clean on close()
- Makes SSHHTTPAdapter reopen a closed connection when needed
like the others

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-15 11:23:00 +01:00
Ulysses Souza e48a1a94e6 Sets a different default number of pools to SSH 
This is because default the number of connections
in OpenSSH is 10

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-15 11:23:00 +01:00
Hannes Ljungberg 8d1e9670b1 Return API response on service update 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-03-13 10:12:17 +01:00
Leks 37e096f6ad set buildargs default value if None 
Signed-off-by: Leks <alexsmir@list.ru>
 2019-03-01 14:05:39 +03:00
Jean-Christophe Sirot 24ace2dac8
Merge pull request #2259 from p1100i/patch-1 
Fix `network_mode` API documentation wording
 2019-02-28 14:56:23 +01:00
p1100i 189552eb57 Fix `network_mode` API documentation wording 
Signed-off-by: p1100i <p1100i@gmx.com>
 2019-02-21 07:55:38 +01:00
Joffrey F 61bab63798
Merge pull request #2245 from thombashi/fix_api_ver_desc 
Fix descriptions of the default API version in docs
 2019-01-25 20:32:43 -08:00
Tsuyoshi Hombashi 6935ce8819
Fix descriptions of the default API version in docs 
1.30 -> 1.35

Signed-off-by: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
 2019-01-26 12:47:20 +09:00
Ulysses Souza d7772b73f2
Merge pull request #2234 from hannseman/placement-preference-tuples 
Make PlacementPreference build correct context
 2019-01-22 17:24:38 +01:00
Ulysses Souza 26f9e4b23f
Merge pull request #2233 from wvaske/2232-Adding_supported_options_to_container_run_documentation 
Added missing options from RUN_HOST_CONFIG_KWARGS list in docker.models.containers to the docstring for client.containers.run()
 2019-01-22 15:02:02 +01:00
Hannes Ljungberg d429a823ed Make PlacementPreference build correct context 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-01-18 21:50:31 +01:00
wvaske 24f7c6db66 Added missing options from RUN_HOST_CONFIG_KWARGS list in docker.models.containers to the docstring for client.containers.run() 
Signed-off-by: wvaske <wvaske@micron.com>
 2019-01-17 10:43:20 -06:00
Christopher Crone 28c9100a7c Bump to next dev version 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2019-01-10 18:26:02 +01:00
Chris Crone 78b15e0f63
Merge pull request #2224 from docker/release 
Resync release
 2019-01-10 18:20:12 +01:00
Chris Crone ac92219295
Merge pull request #2223 from docker/3.7.0-release 
3.7.0 release
 2019-01-10 18:15:58 +01:00
Ulysses Souza e6783d8cf3 Bump 3.7.0 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-01-10 17:58:39 +01:00
Joffrey F 55a62c26e7
Merge pull request #2221 from docker/proxy_env_fixes 
Remove use_config_proxy from exec. Add use_config_proxy docs to DockerClient
 2019-01-09 14:58:32 -08:00
Joffrey F a579e9e205 Remove use_config_proxy from exec. Add use_config_proxy docs to DockerClient 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-01-09 14:45:13 -08:00
Joffrey F 1073b73648
Merge pull request #2216 from thaJeztah/fix_status_code_check 
Regression 443 test: relax status-code check
 2019-01-09 12:40:31 -08:00
Sebastiaan van Stijn 219c52141e
Regression 443 test: relax status-code check 
This test was testing for a 500 status, but this status
is actually a bug in the API (as it's due to an invalid
request), and the API should actually return a 400 status.

To make this test handle both situations, relax the test
to accept either a 4xx or 5xx status.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-09 21:23:11 +01:00
Joffrey F 5455c04f75
Merge pull request #2219 from docker/2199-proxy-support 
Support using proxy values from config
 2019-01-09 12:05:39 -08:00
Joffrey F 65bebc085a Style fixes and removed some unused code 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 6969e8becd handle url-based proxy configurations 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 2c4a8651a8 By default, disable proxy support 
This is to avoid a breaking change

Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 73c17f85e5 fix typo in docstring 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry f97f71342f refactor ProxyConfig 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00