Commit Graph

3090 Commits

Author SHA1 Message Date
Joffrey F 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
Adam Dangoor 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
Joffrey F 1aaa76dc5b
Merge pull request #2297 from hannseman/service-init
Add support for setting init on services
2019-04-14 15:07:47 -07:00
Sebastiaan van Stijn 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
Chris Crone 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
Ulysses Souza 94d1edc33e
Merge pull request #2307 from ulyssessouza/xfail-flaky-test
Avoid race condition on test
2019-04-04 14:35:31 +02:00
Ulysses Souza 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
Ulysses Souza 1b572a4340
Merge pull request #1882 from larkost/1743-container-ports
add ports to containers
2019-04-03 11:20:02 +02:00
Hannes Ljungberg 8010d8ba1e Document correct listen_addr on join swarm
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
2019-03-31 23:20:16 +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
Hannes Ljungberg 0d5aacc464 Add support for setting init on services
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
2019-03-28 16:03:48 +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 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
Ian Campbell 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
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
Ulysses Souza 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
Ulysses Souza d1f7979f24 Refactor and add tests
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-26 17:28:49 +01:00
Karl Kuehn 4890864d65 add ports to containers
Signed-off-by: Karl Kuehn <kuehn.karl@gmail.com>
2019-03-26 16:55:45 +01:00
Ulysses Souza b2175c9475 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-26 16:04:06 +01:00
Ulysses Souza 15862eacbf 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-26 16:04:06 +01:00
Ian Campbell 02e660da12
Merge pull request #2227 from docker/2225-inspect_distrib_auth
Add registry auth header to inspect_distribution requests
2019-03-26 10:17:12 +00:00
Ian Campbell c1fea8ee4a
Merge pull request #2288 from hannseman/container-run-create-volume_driver
Move volume_driver to RUN_HOST_CONFIG_KWARGS
2019-03-25 12:24:54 +00:00
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 523371e21d Move volume_driver to RUN_HOST_CONFIG_KWARGS
Fixes #2271

Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
2019-03-23 20:57:23 +01: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