diff --git a/docker/api/secret.py b/docker/api/secret.py index fa4c2ab8..e57952b5 100644 --- a/docker/api/secret.py +++ b/docker/api/secret.py @@ -53,7 +53,7 @@ class SecretApiMixin(object): Retrieve secret metadata Args: - id (string): Full ID of the secret to remove + id (string): Full ID of the secret to inspect Returns (dict): A dictionary of metadata diff --git a/docker/types/healthcheck.py b/docker/types/healthcheck.py index 61857c21..9815018d 100644 --- a/docker/types/healthcheck.py +++ b/docker/types/healthcheck.py @@ -14,7 +14,7 @@ class Healthcheck(DictType): - Empty list: Inherit healthcheck from parent image - ``["NONE"]``: Disable healthcheck - ``["CMD", args...]``: exec arguments directly. - - ``["CMD-SHELL", command]``: RUn command in the system's + - ``["CMD-SHELL", command]``: Run command in the system's default shell. If a string is provided, it will be used as a ``CMD-SHELL`` @@ -23,9 +23,9 @@ class Healthcheck(DictType): should be 0 or at least 1000000 (1 ms). timeout (int): The time to wait before considering the check to have hung. It should be 0 or at least 1000000 (1 ms). - retries (integer): The number of consecutive failures needed to + retries (int): The number of consecutive failures needed to consider a container as unhealthy. - start_period (integer): Start period for the container to + start_period (int): Start period for the container to initialize before starting health-retries countdown in nanoseconds. It should be 0 or at least 1000000 (1 ms). """ @@ -53,6 +53,8 @@ class Healthcheck(DictType): @test.setter def test(self, value): + if isinstance(value, six.string_types): + value = ["CMD-SHELL", value] self['Test'] = value @property diff --git a/docker/version.py b/docker/version.py index 24731263..25c92501 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,2 +1,2 @@ -version = "4.0.1" +version = "4.0.2" version_info = tuple([int(d) for d in version.split("-")[0].split(".")]) diff --git a/docs/change-log.md b/docs/change-log.md index 4032249b..b10cfd54 100644 --- a/docs/change-log.md +++ b/docs/change-log.md @@ -1,6 +1,20 @@ Change log ========== +4.0.2 +----- + +[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/62?closed=1) + +### Bugfixes + +- Unified the way `HealthCheck` is created/configured + +### Miscellaneous + +- Bumped version of websocket-client + + 4.0.1 ----- diff --git a/requirements.txt b/requirements.txt index 70f37e20..804a78a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,4 +16,4 @@ pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6' requests==2.20.0 six==1.10.0 urllib3==1.24.3 -websocket-client==0.40.0 +websocket-client==0.56.0