Skip to content

Commit fcb38a5

Browse files
committed
Ignore MacAddress when comparing containers with system docker >= 25.0
1 parent 03ad4c6 commit fcb38a5

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

salt/states/docker_container.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -1843,10 +1843,17 @@ def _delete_temp_container():
18431843
)
18441844

18451845
if not skip_comparison:
1846+
docker_version_info = __salt__["docker.version"]()["VersionInfo"]
1847+
if docker_version_info < (25, 0):
1848+
compare_containers_ignore = "Hostname"
1849+
else:
1850+
# With docker >= 25.0 we get a new value to compare,
1851+
# MacAddress, which we'll ignore for now.
1852+
compare_containers_ignore = "Hostname,MacAddress"
18461853
container_changes = __salt__["docker.compare_containers"](
18471854
name,
18481855
temp_container_name,
1849-
ignore="Hostname",
1856+
ignore=compare_containers_ignore,
18501857
)
18511858
if container_changes:
18521859
if _check_diff(container_changes):

0 commit comments

Comments
 (0)