summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Separate into individual testsfix_exec_demux_testsJoffrey F2019-05-011-63/+77
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Avoid demux test flakinessJoffrey F2019-04-301-27/+21
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2309 from thaJeztah/remove_init_path_createJoffrey F2019-04-302-14/+0
|\ | | | | Remove init_path from create
| * Remove init_path from createSebastiaan van Stijn2019-04-102-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | This option was never functional, and was not intended to be added to the "container create" API, so let's remove it, because it has been removed in Docker 17.05, and was broken in versions before that; see - https://github.com/moby/moby/issues/32355 --init-path does not seem to work - https://github.com/moby/moby/pull/32470 remove --init-path from client Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | Merge pull request #2325 from docker/fix_versions_scriptJoffrey F2019-04-301-3/+3
|\ \ | | | | | | Fix versions.py to include release stage
| * | Fix versions.py to include release stagefix_versions_scriptJoffrey F2019-04-301-3/+3
|/ / | | | | | | Signed-off-by: Joffrey F <f.joffrey@gmail.com>
* | Merge pull request #2322 from adamtheturtle/fix-rendered-exit-code-exec-runJoffrey F2019-04-271-1/+1
|\ \ | | | | | | Replace triple backtick in exec_run documentation which caused a rend…
| * | Replace triple backtick in exec_run documentation which caused a rendering ↵Adam Dangoor2019-04-271-1/+1
|/ / | | | | | | | | | | error. Signed-off-by: Adam Dangoor <adamdangoor@gmail.com>
* | Merge pull request #2297 from hannseman/service-initJoffrey F2019-04-144-1/+27
|\ \ | |/ |/| Add support for setting init on services
| * Add support for setting init on servicesHannes Ljungberg2019-03-284-1/+27
| | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
* | Merge pull request #2304 from hannseman/swarm-join-listen_addrChris Crone2019-04-041-1/+1
|\ \ | | | | | | Document correct listen_addr default on join swarm
| * | Document correct listen_addr on join swarmHannes Ljungberg2019-03-311-1/+1
| |/ | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
* | Merge pull request #2307 from ulyssessouza/xfail-flaky-testUlysses Souza2019-04-041-5/+2
|\ \ | | | | | | Avoid race condition on test
| * | Add 'sleep 2' to avoid race condition on attachUlysses Souza2019-04-041-5/+2
|/ / | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | Merge pull request #1882 from larkost/1743-container-portsUlysses Souza2019-04-032-0/+67
|\ \ | |/ |/| add ports to containers
| * Refactor and add testsUlysses Souza2019-03-261-8/+46
| | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| * add ports to containersKarl Kuehn2019-03-262-0/+29
| | | | | | | | Signed-off-by: Karl Kuehn <kuehn.karl@gmail.com>
* | Merge pull request #2298 from ijc/fix-docker-version-detection-scriptUlysses Souza2019-03-281-7/+3
|\ \ | | | | | | scripts/version.py: Use regex grouping to extract the version
| * | scripts/version.py: Use regex grouping to extract the versionIan Campbell2019-03-281-7/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #2292 from ulyssessouza/fix-config-proxy-mappingUlysses Souza2019-03-273-8/+12
|\ \ | |/ |/| Fix base_url to keep TCP protocol
| * Fix base_url to keep TCP protocolUlysses Souza2019-03-262-7/+9
| | | | | | | | | | | | | | | | 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>
| * Xfail test_attach_stream_and_cancel on TLSUlysses Souza2019-03-261-1/+3
|/ | | | | | This test is quite flaky on ssl integration test Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* Merge pull request #2227 from docker/2225-inspect_distrib_authIan Campbell2019-03-262-16/+32
|\ | | | | Add registry auth header to inspect_distribution requests
| * Add registry auth header to inspect_distribution requests2225-inspect_distrib_authJoffrey F2019-01-112-16/+32
| | | | | | | | | | | | | | Update docstring for auth_config parameter in pull, push, and inspect_distribution Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2288 from hannseman/container-run-create-volume_driverIan Campbell2019-03-253-2/+12
|\ \ | | | | | | Move volume_driver to RUN_HOST_CONFIG_KWARGS
| * | Move volume_driver to RUN_HOST_CONFIG_KWARGSHannes Ljungberg2019-03-233-2/+12
| | | | | | | | | | | | | | | | | | Fixes #2271 Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
* | | Merge pull request #2287 from hannseman/swarm-default-addr-pool-reduxIan Campbell2019-03-254-4/+75
|\ \ \ | | | | | | | | Redux added arguments to create a swarm with a custom address pool and subnet size.
| * | | Fix documentation and order of argumentsHannes Ljungberg2019-03-222-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Split monolithic integration tests into individual tests.Barry Shapira2019-03-221-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Check API version before setting swarm addr pool.Barry Shapira2019-03-224-15/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Added arguments to creeate a swarm with a custom address pool and subnet size.Barry Shapira2019-03-223-0/+42
| |/ / | | | | | | | | | Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
* | | Merge pull request #2282 from ulyssessouza/avoid-race-condition-on-autoremoveIan Campbell2019-03-251-2/+7
|\ \ \ | | | | | | | | Avoid race condition on short execution
| * | | Avoid race condition on short executionUlysses Souza2019-03-251-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | | Merge pull request #2281 from hannseman/sctp-protocolUlysses Souza2019-03-255-13/+29
|\ \ \ \ | | | | | | | | | | Support for SCTP
| * | | | Test port lookup with protocolsHannes Ljungberg2019-03-181-4/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
| * | | | Test all split_port with all valid protocolsHannes Ljungberg2019-03-181-3/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
| * | | | Support sctp as protocolHannes Ljungberg2019-03-183-6/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
* | | | | Merge pull request #2265 from lekster/masterJoffrey F2019-03-231-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | set buildargs default value if None
| * | | | set buildargs default value if NoneLeks2019-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Leks <alexsmir@list.ru>
* | | | | Merge pull request #2284 from ulyssessouza/masterChris Crone2019-03-202-1/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | Update changelog and next milestone
| * | | | Update changelog and next milestoneUlysses Souza2019-03-202-1/+14
| |\ \ \ \ |/ / / / / | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| * | | | Merge pull request #2283 from ulyssessouza/3.7.1-release3.7.1Djordje Lukic2019-03-2011-37/+76
| |\ \ \ \ | | | | | | | | | | | | 3.7.1 release
| | * | | | Bump 3.7.1Ulysses Souza2019-03-202-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | * | | | Fix BaseHTTPAdapter for the SSL caseUlysses Souza2019-03-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | * | | | Homogenize adapters close() behaviour.Ulysses Souza2019-03-208-33/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| | * | | | Sets a different default number of pools to SSHUlysses Souza2019-03-202-3/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because default the number of connections in OpenSSH is 10 Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | | | | Update doc for container.exec_run & exec_api about demuxYincen Xia2019-03-192-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yincen Xia <philip980507@msn.cn>
* | | | | Fix BaseHTTPAdapter for the SSL caseUlysses Souza2019-03-191-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | | | | Merge pull request #2272 from hannseman/update-service-responseJoffrey F2019-03-161-3/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Return API response on service update
| * | | | Return API response on service updateHannes Ljungberg2019-03-131-3/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
View Lorry Controller Status