From abac141122d3c3beac29dae7f04551fb05ed9c74 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Fri, 12 Nov 2021 16:59:09 -0800 Subject: [PATCH] fix support containers under podman (#76292) * `podman inspect` falls back to a same-named image if the named container is not present; since eg `http-test-container` is both the name of the image and container, it wasn't working properly under podman in many instances. Switching to `docker|podman container inspect` limits the query to containers only for both podman and docker, allowing the support container detection/creation to work properly. --- .../fragments/ansible-test-podman-support-containers.yaml | 2 ++ test/lib/ansible_test/_internal/docker_util.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/ansible-test-podman-support-containers.yaml diff --git a/changelogs/fragments/ansible-test-podman-support-containers.yaml b/changelogs/fragments/ansible-test-podman-support-containers.yaml new file mode 100644 index 00000000000..7838c9243ae --- /dev/null +++ b/changelogs/fragments/ansible-test-podman-support-containers.yaml @@ -0,0 +1,2 @@ +bugfixes: + - ansible-test - fixed support container failures (eg http-test-container) under podman diff --git a/test/lib/ansible_test/_internal/docker_util.py b/test/lib/ansible_test/_internal/docker_util.py index cab2451f86d..a92ccbd1e83 100644 --- a/test/lib/ansible_test/_internal/docker_util.py +++ b/test/lib/ansible_test/_internal/docker_util.py @@ -401,11 +401,11 @@ class DockerInspect: def docker_inspect(args, identifier, always=False): # type: (EnvironmentConfig, str, bool) -> DockerInspect """ - Return the results of `docker inspect` for the specified container. + Return the results of `docker container inspect` for the specified container. Raises a ContainerNotFoundError if the container was not found. """ try: - stdout = docker_command(args, ['inspect', identifier], capture=True, always=always)[0] + stdout = docker_command(args, ['container', 'inspect', identifier], capture=True, always=always)[0] except SubprocessError as ex: stdout = ex.stdout