Honor DOCKER_HOST in get_api_client()#396
Merged
Merged
Conversation
The docker-py SDK's APIClient() constructor does not read DOCKER_HOST;
only from_env() does. Without it, emu-docker silently ignores the env
var and falls back to /var/run/docker.sock, which fails on Docker
Desktop, podman, and anyone whose daemon socket is elsewhere with:
DockerException: Error while fetching server API version:
('Connection aborted.', PermissionError(13, 'Permission denied'))
Pass base_url=os.environ.get("DOCKER_HOST") so the standard env var
contract works. Also corrects the malformed fallback URI
unix://var/run/docker.sock to the canonical
unix:///var/run/docker.sock.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
DOCKER_HOSTthrough todocker.APIClient(base_url=...). The docker-py SDK'sAPIClient()constructor reads no env vars (onlyfrom_env()does), so emu-docker silently falls back to/var/run/docker.sockon every machine. That's broken for Docker Desktop, podman, and anyone whose daemon socket is elsewhere.unix://var/run/docker.sock→unix:///var/run/docker.sock(canonical 3-slash form).Symptom without this fix
Test plan
DOCKER_HOST=unix:///run/user/1000/podman/podman.sock(rootless podman):emu-docker create <emu.zip> <sysimg.zip> --startbuilds the image, boots Android 9 (API 28) in the container,adb connectsucceeds,sys.boot_completed=1.DOCKER_HOSTset: behavior unchanged —docker.APIClient(base_url=None)is equivalent todocker.APIClient().Related
PermissionError [Errno 13]on the docker socket). Closed at the time as a user/permissions issue, but the same fix would have unblocked any reporter on a non-default socket (Docker Desktop, podman).