diff --git a/changelogs/fragments/ansible-test-docker-hostname.yml b/changelogs/fragments/ansible-test-docker-hostname.yml new file mode 100644 index 00000000000..beb2acead81 --- /dev/null +++ b/changelogs/fragments/ansible-test-docker-hostname.yml @@ -0,0 +1,2 @@ +bugfixes: +- ansible-test - Fix docker hostname parsing diff --git a/test/lib/ansible_test/_internal/docker_util.py b/test/lib/ansible_test/_internal/docker_util.py index a2bc9927d03..c2458d8c869 100644 --- a/test/lib/ansible_test/_internal/docker_util.py +++ b/test/lib/ansible_test/_internal/docker_util.py @@ -507,7 +507,7 @@ def get_docker_hostname() -> str: if docker_host and docker_host.startswith(('tcp://', 'ssh://')): try: - hostname = urllib.parse.urlparse(docker_host)[1].split(':')[0] + hostname = urllib.parse.urlparse(docker_host).hostname display.info('Detected Docker host: %s' % hostname, verbosity=1) except ValueError: hostname = 'localhost' @@ -516,7 +516,7 @@ def get_docker_hostname() -> str: hostname = 'localhost' display.info('Assuming Docker is available on localhost.', verbosity=1) - return hostname + return hostname or 'localhost' @cache