saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ignore MacAddress when comparing containers with system docker >= 25.0

Browse source
This commit is contained in:
Pedro Algarvio 2024-02-28 22:32:11 +00:00
parent 03ad4c6337
commit fcb38a54d5
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/states/docker_container.py
View file

@ -1843,10 +1843,17 @@ def running(
) )
if not skip_comparison: if not skip_comparison:
docker_version_info = __salt__["docker.version"]()["VersionInfo"]
if docker_version_info < (25, 0):
compare_containers_ignore = "Hostname"
else:
# With docker >= 25.0 we get a new value to compare,
# MacAddress, which we'll ignore for now.
compare_containers_ignore = "Hostname,MacAddress"
container_changes = __salt__["docker.compare_containers"]( container_changes = __salt__["docker.compare_containers"](
name, name,
temp_container_name, temp_container_name,
ignore="Hostname", ignore=compare_containers_ignore,
) )
if container_changes: if container_changes:
if _check_diff(container_changes): if _check_diff(container_changes):