c2ceb89329
Merge pull request #2346 from itssimon/master
...
Change os.errno to errno for py3.7 compatibility
2019-05-18 19:34:36 -07:00
31fec93872
Change os.errno to errno for py3.7 compatibility
...
Signed-off-by: Simon Gurcke <simon@gurcke.de>
2019-05-19 12:20:12 +10:00
181fade33a
Merge pull request #2343 from docker/rtd-conf
...
Add readthedocs config
2019-05-18 19:17:54 -07:00
31236ba5a7
Add readthedocs config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-18 19:13:45 -07:00
37e442aaed
Merge pull request #2339 from ulyssessouza/bump-urllib3
...
Bump urllib3 -> 1.24.3
2019-05-15 13:06:14 -07:00
690b0ce9c4
Bump urllib3 -> 1.24.3
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-15 10:21:26 +02:00
23c5c001c6
Merge pull request #2329 from docker/end_3.4_support
...
End Python 3.4 support
2019-05-05 16:37:45 -07:00
e2c1c9caac
Merge pull request #2332 from docker/use_proxy_config_default
...
Change use_config_proxy default value to True to match CLI behavior
2019-05-02 13:11:07 -07:00
7f56f7057c
Don't add superfluous arguments
...
Signed-off-by: Joffrey F <f.joffrey@gmail.com>
2019-05-02 12:46:56 -07:00
87ee18aa39
Change use_config_proxy default value to True to match CLI behavior
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 20:52:01 -07:00
836194c64f
Merge pull request #2295 from hannseman/swarm-rotate-token
...
Add support for rotate_manager_unlock_key
2019-05-01 20:36:45 -07:00
bdc954b009
Stop supporting EOL Python 3.4
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 19:51:29 -07:00
1aae20d13a
Remove obsolete win32-requirements file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 19:44:23 -07:00
75e0ad017c
Merge pull request #2328 from docker/modernize_test_deps
...
Update some test dependencies / default values with newer versions
2019-05-01 02:48:05 -07:00
532c62ee51
Add support for rotate_manager_unlock_key
...
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
2019-05-01 11:45:20 +02:00
eba8345c37
Update some test dependencies / default values with newer versions
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 02:36:19 -07:00
4d62dd0a64
Merge pull request #2296 from hannseman/swarm-init-response
...
Return node id on swarm init
2019-05-01 02:29:30 -07:00
9682422718
Merge pull request #2303 from hannseman/swarm-DataPathAddr
...
Add support for swarm DataPathAddr
2019-05-01 02:22:06 -07:00
cc13b82e9f
Merge pull request #2222 from docker/vendor_dockerpycreds
...
Make dockerpycreds part of the SDK under docker.credentials
2019-05-01 01:39:54 -07:00
be9cf3e39e
Merge pull request #2327 from docker/demux_test_fixes
...
Streaming TTY messages sometimes get truncated
2019-05-01 01:30:29 -07:00
110c6769c9
Add test for join on already joined swarm
...
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
2019-05-01 10:24:50 +02:00
c7b9cae0a0
Add swarm support for data_addr_path
...
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
2019-05-01 10:24:50 +02:00
acd7a8f430
Return node id on swarm init
...
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
2019-05-01 10:24:02 +02:00
1a4881acd9
Improve low_timeout test resilience
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 01:15:41 -07:00
34ffc56865
Streaming TTY messages sometimes get truncated. Handle gracefully in demux tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 00:59:35 -07:00
992e0dcdfb
Merge pull request #2317 from docker/fix_socket_detach_helper
...
Fix socket detach helper
2019-05-01 00:57:27 -07:00
62c8bcbbb6
Increase timeout on test with long sleeps
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 00:47:16 -07:00
a2a2d100e8
Reorder imports
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 00:35:12 -07:00
2e67cd1cc7
Improve socket_detached test helper to support future versions of the daemon
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 00:35:12 -07:00
63cda2e7b5
Merge pull request #2326 from docker/fix_exec_demux_tests
...
Avoid demux test flakiness
2019-05-01 00:34:28 -07:00
073a21c28a
Separate into individual tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 00:20:40 -07:00
b06e437da8
Avoid demux test flakiness
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-04-30 23:47:09 -07:00
4c45067df9
New Jenkinsfile build instructions
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-04-30 23:37:55 -07:00
a823acc2ca
Make dockerpycreds part of the SDK under docker.credentials
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-04-30 23:37:55 -07:00
0287cd9f2e
Merge pull request #2309 from thaJeztah/remove_init_path_create
...
Remove init_path from create
2019-04-30 23:37:06 -07:00
41e1c05426
Merge pull request #2325 from docker/fix_versions_script
...
Fix versions.py to include release stage
2019-04-30 23:36:23 -07:00
20a5c06724
Fix versions.py to include release stage
...
Signed-off-by: Joffrey F <f.joffrey@gmail.com>
2019-04-30 23:16:09 -07:00
613d6aad83
Merge pull request #2322 from adamtheturtle/fix-rendered-exit-code-exec-run
...
Replace triple backtick in exec_run documentation which caused a rend…
2019-04-27 15:28:42 -07:00
221d64f427
Replace triple backtick in exec_run documentation which caused a rendering error.
...
Signed-off-by: Adam Dangoor <adamdangoor@gmail.com>
2019-04-27 09:16:28 +01:00
1aaa76dc5b
Merge pull request #2297 from hannseman/service-init
...
Add support for setting init on services
2019-04-14 15:07:47 -07:00
50d475797a
Remove init_path from create
...
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>
2019-04-10 02:42:23 +02:00
5e8b1c0e2a
Merge pull request #2304 from hannseman/swarm-join-listen_addr
...
Document correct listen_addr default on join swarm
2019-04-04 14:51:17 +02:00
94d1edc33e
Merge pull request #2307 from ulyssessouza/xfail-flaky-test
...
Avoid race condition on test
2019-04-04 14:35:31 +02:00
ef043559c4
Add 'sleep 2' to avoid race condition on attach
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-04-04 14:09:18 +02:00
1b572a4340
Merge pull request #1882 from larkost/1743-container-ports
...
add ports to containers
2019-04-03 11:20:02 +02:00
8010d8ba1e
Document correct listen_addr on join swarm
...
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
2019-03-31 23:20:16 +02:00
0d5aacc464
Add support for setting init on services
...
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
2019-03-28 16:03:48 +01:00
f97c577c1d
Merge pull request #2298 from ijc/fix-docker-version-detection-script
...
scripts/version.py: Use regex grouping to extract the version
2019-03-28 15:50:44 +01:00
b0abdac90c
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 13:18:02 +00:00
3244094d97
Merge pull request #2292 from ulyssessouza/fix-config-proxy-mapping
...
Fix base_url to keep TCP protocol
2019-03-27 17:52:31 +01:00
Joffrey F
Simon Gurcke
Joffrey F
Ulysses Souza
Joffrey F
Hannes Ljungberg
Adam Dangoor
Sebastiaan van Stijn
Chris Crone
Ian Campbell