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

2789 Commits

Author SHA1 Message Date
Joffrey F abc7308008 Fix versions.py to include release stage 
Signed-off-by: Joffrey F <f.joffrey@gmail.com>
 2019-06-21 16:20:46 +02:00
Djordje Lukic 193cd93a11 bump version 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-06-21 16:00:22 +02:00
Djordje Lukic e0663f5c92 Bump websocket-client -> 0.56.0 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-06-21 15:58:20 +02:00
Ulysses Souza a4c251d230
Merge pull request #2299 from ulyssessouza/3.7.2-release 
Bump 3.7.2 release
 2019-03-28 17:30:26 +01:00
Ulysses Souza 8f2d9a5687 Bump 3.7.2 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-28 15:56:18 +01:00
Ian Campbell cd59491b9a scripts/version.py: Use regex grouping to extract the version 
The `lstrip` and `rstrip` functions take a set of characters to remove, not a
prefix/suffix. Thus `rstrip('-x86_64')` will remove any trailing characters in
the string `'-x86_64'` in any order (in effect it strips the suffix matching
the regex `[-_x468]*`). So with `18.09.4` it removes the `4` suffix resulting
in trying to `int('')` later on:

    Traceback (most recent call last):
      File "/src/scripts/versions.py", line 80, in <module>
        main()
      File "/src/scripts/versions.py", line 73, in main
        versions, reverse=True, key=operator.attrgetter('order')
      File "/src/scripts/versions.py", line 52, in order
        return (int(self.major), int(self.minor), int(self.patch)) + stage
    ValueError: invalid literal for int() with base 10: ''

Since we no longer need to check for the arch suffix (since it no longer
appears in the URLs we are traversing) we could just drop the `rstrip` and
invent a local prefix stripping helper to replace `lstrip('docker-')`. Instead
lets take advantage of the behaviour of `re.findall` which is that if the regex
contains a single `()` match that will be returned. This lets us match exactly
the sub-section of the regex we require.

While editing the regex, also ensure that the suffix is precisely `.tgz` and
not merely `tgz` by adding an explicit `\.`, previously the literal `.` would
be swallowed by the `.*` instead.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2019-03-28 15:56:18 +01:00
Ulysses Souza b05bfd7b22 Fix base_url to keep TCP protocol 
This fix lets the responsability of changing the
protocol to `parse_host` afterwards, letting
`base_url` with the original value.

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-28 14:16:52 +01:00
Ulysses Souza 33b8fd6eec Xfail test_attach_stream_and_cancel on TLS 
This test is quite flaky on ssl integration test

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-28 14:16:18 +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
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
Corentin Henry 9146dd57d7 code style improvement 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 708ef6d81e Revert "make the integration tests more verbose" 
This reverts commit 7584e5d7f0.

Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 0d37390c46 add integration tests for proxy support 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 4f79ba160e make the integration tests more verbose 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 545adc2a59 add unit tests for ProxyConfig 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 6e227895d3 tests: remove outdated code 
the _cfg attribute does not exist anymore

Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry bfdd0a881e add support for proxies 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Joffrey F 4ca4e94ea7
Merge pull request #2218 from docker/fix_test_deps 
Update test dependencies to latest version, fix some flake8 errors
 2019-01-09 11:30:38 -08:00
Joffrey F 72f4f527ad Update test dependencies to latest version, fix some flake8 errors 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-01-09 11:18:40 -08:00
Joffrey F 5fc7f62ec4
Merge pull request #2213 from docker/2210-swarm-init-return 
Make swarm.init() return value match documentation
 2018-12-28 16:19:33 -08:00
Joffrey F 3cda1e8bbd Make swarm.init() return value match documentation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-12-28 15:45:54 -08:00
Joffrey F 3151b0ef2f
Merge pull request #2207 from BoboTiG/patch-1 
Fix DeprecationWarning: invalid escape sequence in services.py
 2018-12-28 07:32:10 +09:00
Joffrey F 60ffeede92
Merge pull request #2208 from BoboTiG/patch-2 
Fix DeprecationWarning: invalid escape sequence in ports.py
 2018-12-28 07:30:46 +09:00
Mickaël Schoentgen e99ce1e359 Fix DeprecationWarning: invalid escape sequence in ports.py 
Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
 2018-12-20 14:54:52 +01:00
Mickaël Schoentgen 341e2580aa Fix DeprecationWarning: invalid escape sequence in services.py 
Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
 2018-12-20 14:54:15 +01:00
Joffrey F 7911c54635
Merge pull request #2204 from MaxBischoff/typo-fix 
Fixed a typo in the configs api doc
 2018-12-14 12:27:25 -08:00
Maximilian Bischoff 543d83cb09 Fixed a typo in the configs api doc 
The documentation for id in ConfigApiMixin inspect_config was wrongly
mentioning removal of a config

Signed-off-by: Maximilian Bischoff <maximilianbischoff2@gmail.com>
 2018-12-14 19:21:57 +01:00
Joffrey F d77d4256d7
Merge pull request #2197 from docker/2185-placement-prefs 
Improve handling of placement preferences and associated docs
 2018-12-11 08:41:33 -08:00
Joffrey F f39b1df407
Merge pull request #2198 from docker/update_versionmap 
Update Jenkinsfile version map
 2018-12-11 08:40:53 -08:00
Joffrey F a207122c0d Update Jenkinsfile version map 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-12-07 17:04:54 -08:00
Joffrey F b297b837df Dynamically retrieve version information for generated docs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-12-07 16:57:40 -08:00
Joffrey F e15db4cb20 Improve handling of placement preferences; improve docs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-12-07 16:56:45 -08:00
Joffrey F 92236550d2
Merge pull request #2196 from docker/2194-clean-release 
Prevent untracked files in releases
 2018-12-07 16:08:18 -08:00
Joffrey F 1bc5783a3d Prevent untracked files in releases 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-12-07 16:08:00 -08:00
Joffrey F 11250042eb
Merge pull request #2193 from docker/update_setup_py 
Update setup.py for modern pypi / setuptools
 2018-11-30 18:00:55 -08:00