Skip to content

Commit b5a7f32

Browse files
authored
Merge pull request #177 from TomasTomecek/fix-175
python-docker 7.x compatibility
2 parents d15ae8b + 7241d28 commit b5a7f32

File tree

2 files changed

+32
-10
lines changed

2 files changed

+32
-10
lines changed

sen/docker_backend.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ def __init__(self):
791791
self._df = None
792792

793793
kwargs = {"version": "auto"}
794-
kwargs.update(docker.utils.kwargs_from_env(assert_hostname=False))
794+
kwargs.update(docker.utils.kwargs_from_env())
795795

796796
try:
797797
APIClientClass = docker.Client # 1.x

tests/real.py

+31-9
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,38 @@
2929
'Status': 'Exited (0) 47 hours ago'
3030
}
3131

32-
3332
version_data = {
34-
'ApiVersion': '1.21',
35-
'Arch': 'amd64',
36-
'BuildTime': 'Thu Sep 10 17:53:19 UTC 2015',
37-
'GitCommit': 'af9b534-dirty',
38-
'GoVersion': 'go1.5.1',
39-
'KernelVersion': '4.2.5-300.fc23.x86_64',
40-
'Os': 'linux',
41-
'Version': '1.9.0-dev-fc24'
33+
'Platform': {'Name': 'linux/amd64/fedora-40'},
34+
'Components': [{
35+
'Name': 'Podman Engine',
36+
'Version': '5.1.2',
37+
'Details': {
38+
'APIVersion': '5.1.2',
39+
'Arch': 'amd64',
40+
'BuildTime': '2024-07-10T02:00:00+02:00',
41+
'Experimental': 'false',
42+
'GitCommit': '',
43+
'GoVersion': 'go1.22.5',
44+
'KernelVersion': '6.9.11-200.fc40.x86_64',
45+
'MinAPIVersion': '4.0.0',
46+
'Os': 'linux'}},
47+
{
48+
'Name': 'Conmon',
49+
'Version': 'conmon version 2.1.10, commit: ',
50+
'Details': {'Package': 'conmon-2.1.10-1.fc40.x86_64'}},
51+
{
52+
'Name': 'OCI Runtime (crun)',
53+
'Version': 'crun version 1.15\ncommit: e6eacaf4034e84185fd8780ac9262bbf57082278\nrundir: /run/user/1000/crun\nspec: 1.0.0\n+SYSTEMD +SELINUX +APPARMOR +CAP +SECCOMP +EBPF +CRIU +LIBKRUN +WASM:wasmedge +YAJL',
54+
'Details': {'Package': 'crun-1.15-1.fc40.x86_64'}}],
55+
'Version': '5.1.2',
56+
'ApiVersion': '1.41',
57+
'MinAPIVersion': '1.24',
58+
'GitCommit': '',
59+
'GoVersion': 'go1.22.5',
60+
'Os': 'linux',
61+
'Arch': 'amd64',
62+
'KernelVersion': '6.9.11-200.fc40.x86_64',
63+
'BuildTime': '2024-07-10T02:00:00+02:00'
4264
}
4365

4466
top_data = {

0 commit comments

Comments
 (0)