upstream/ansible
1
0
Fork 0
mirror of https://github.com/ansible/ansible.git synced 2026-02-03 20:40:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix docker hostname parsing in ansible-test (#86235)

Browse source 
* Fix docker hostname parsing in ansible-test

* add clog frag
This commit is contained in:
sivel / Matt Martz 2025-11-20 17:54:33 -06:00 committed by GitHub
parent 9d9a8d78ee
commit bff3a9aeb9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/ansible-test-docker-hostname.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- ansible-test - Fix docker hostname parsing

4
test/lib/ansible_test/_internal/docker_util.py
View file

@ -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