Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/api/secret.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def inspect_secret(self, id):
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

Expand Down
8 changes: 5 additions & 3 deletions docker/types/healthcheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -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``
Expand All @@ -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).
"""
Expand Down Expand Up @@ -53,6 +53,8 @@ def test(self):

@test.setter
def test(self, value):
if isinstance(value, six.string_types):
value = ["CMD-SHELL", value]
self['Test'] = value

@property
Expand Down
2 changes: 1 addition & 1 deletion docker/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = "4.0.1"
version = "4.0.2"
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
14 changes: 14 additions & 0 deletions docs/change-log.md
Original file line number Diff line number Diff line change
@@ -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
-----

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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