From 8c82bb88d53767c9dee0d2919d43fe12e46c205d Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Sat, 14 Jun 2025 17:16:08 +0200 Subject: [PATCH] ContainerName is also missing in 2.37.1. (#1088) (#1089) (cherry picked from commit ae1d457b49605eb69be9e905fa7c9b26b9ee8de7) Co-authored-by: Felix Fontein --- .../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 6dad2502..a43bec8b 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/build.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/build.yml @@ -93,7 +93,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 f9182d2f..6b9d1fa4 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 47670005..da1b9f9b 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 @@ -94,7 +94,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)