From ae1d457b49605eb69be9e905fa7c9b26b9ee8de7 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 14 Jun 2025 17:03:27 +0200 Subject: [PATCH] ContainerName is also missing in 2.37.1. (#1088) --- .../integration/targets/docker_compose_v2/tasks/tests/build.yml | 2 +- .../targets/docker_compose_v2/tasks/tests/container-exit.yml | 2 +- .../targets/docker_compose_v2/tasks/tests/definition.yml | 2 +- .../targets/docker_compose_v2/tasks/tests/start-stop.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/build.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/build.yml index a7da381d..c39cfa1e 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/build.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/build.yml @@ -112,7 +112,7 @@ - present_1.containers[0].Name == (pname ~ '-' ~ cname ~ '-1') - present_1.images | length == 1 - >- - docker_compose_version is version('2.37.0', '==') or + docker_compose_version is version('2.37.0', '>=') or present_1.images[0].ContainerName == (pname ~ '-' ~ cname ~ '-1') - present_1.images[0].Repository == iname - present_1.images[0].Tag == "latest" diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/container-exit.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/container-exit.yml index e1399e32..989f6a47 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/container-exit.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/container-exit.yml @@ -63,7 +63,7 @@ - present_1.containers[0].ExitCode == 0 - present_1.images | length == 1 - >- - docker_compose_version is version('2.37.0', '==') or + docker_compose_version is version('2.37.0', '>=') or present_1.images[0].ContainerName == (pname ~ '-' ~ cname ~ '-1') - present_1.images[0].Repository == (docker_test_image_alpine | split(':') | first) - present_1.images[0].Tag == (docker_test_image_alpine | split(':') | last) diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/definition.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/definition.yml index c3e07bb2..da034198 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/definition.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/definition.yml @@ -84,7 +84,7 @@ - present_1.containers[0].Image == docker_test_image_alpine - present_1.images | length == 1 - >- - docker_compose_version is version('2.37.0', '==') or + docker_compose_version is version('2.37.0', '>=') or present_1.images[0].ContainerName == (pname ~ '-' ~ cname ~ '-1') - present_1.images[0].Repository == (docker_test_image_alpine | split(':') | first) - present_1.images[0].Tag == (docker_test_image_alpine | split(':') | last) diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml index 736f6902..12d7fec5 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/start-stop.yml @@ -101,7 +101,7 @@ - present_1.containers[0].Image == docker_test_image_alpine - present_1.images | length == 1 - >- - docker_compose_version is version('2.37.0', '==') or + docker_compose_version is version('2.37.0', '>=') or present_1.images[0].ContainerName == (pname ~ '-' ~ cname ~ '-1') - present_1.images[0].Repository == (docker_test_image_alpine | split(':') | first) - present_1.images[0].Tag == (docker_test_image_alpine | split(':') | last)