Repository navigation
Conversation
…ages The VM driver looked for a local container engine through DOCKER_HOST and /var/run/docker.sock only, then Podman. Docker Desktop for macOS can expose just ~/.docker/run/docker.sock, so the driver found no engine and silently fell back to pulling the image from a registry. Try the Docker driver's existing socket discovery between the default connection and the Podman fallback. connect_with_local_defaults stays first because it honours tcp:// and ssh:// DOCKER_HOST values that discovery does not. The detectors are parameters so tests control the ordering without depending on the engines a host runs. This fixes the lookup only. The registry fallback and its error are unchanged. Refs NVIDIA#4155 Signed-off-by: Shiju <shiju@nvidia.com>
shiju-nv
requested review from
a team,
derekwaynecarr,
mrunalp and
sjenning
as code owners
October 4, 2026 12:27
drew
requested changes
Oct 5, 2026
| openshell-sandbox-backend = { path = "../openshell-sandbox-backend" } | ||
| openshell-otel = { path = "../openshell-otel", optional = true } | ||
| openshell-policy = { path = "../openshell-policy", optional = true } | ||
| openshell-driver-docker = { path = "../openshell-driver-docker", optional = true } |
Collaborator
There was a problem hiding this comment.
we cannot add a dep on the docker driver to the vm driver
Collaborator
Author
There was a problem hiding this comment.
I used the existing openshell-driver-podman dependency as precedent. Docker socket discovery now lives in openshell-core. Should we move Podman discovery there too and remove that driver dependency?
Move the existing Docker socket detector beside the core socket probe and keep the Docker driver's public wrapper. Let the VM driver call core and remove its dependency on the Docker driver. Preserve the socket candidates, response filters, and local-defaults then Docker then Podman connection order. Refs NVIDIA#4155 Signed-off-by: Shiju <shiju@nvidia.com>
This branch has not been deployed
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
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
The MicroVM driver looks for a local container engine through
DOCKER_HOSTand/var/run/docker.sockonly, then Podman. Docker Desktop for macOS can expose just~/.docker/run/docker.sock, so the driver reports "no local container engine available" and silently pulls the image from a registry. This adds a second lookup step that reuses the Docker driver's existing socket discovery, which already probes Docker Desktop's per-user socket.Related Issue
Refs #4155. This PR fixes the lookup, which is the first complaint in the issue. The misleading
Not authorizedoutcome and the fallback message are unchanged, so it does not close the issue.Changes
connect_local_container_enginenow delegates toconnect_container_engine, which tries three steps in order:connect_with_local_defaults(kept first because it honourstcp://andssh://DOCKER_HOSTvalues that the Docker driver's discovery does not), then the socket found byopenshell_driver_docker::detect_socket, then the Podman socket as before. A failedDOCKER_HOSTdoes not stop the search, in the same way it already did not stop the Podman fallback.connect_container_engineso tests can control them without depending on the engines a host runs. Production callers pass the real detectors.openshell-driver-vmgains an optionalopenshell-driver-dockerdependency, enabled by itscompute-driverfeature, beside the existingopenshell-driver-podmandependency. It adds no dependency cycle, and the lockfile gains one edge. It also adds the Docker driver library and thetomlcrate family (toml,toml_edit,toml_datetime,toml_write,serde_spanned,winnow) to the VM driver's build, about ten more entries in its dependency tree. The gateway does not link the VM driver, so the gateway binary is unaffected. If maintainers prefer not to take that cost, the alternative is moving the roughly ten-line candidate list intoopenshell-core, where the socket probe helper already lives./_pingserver on a temporary Unix socket.Testing
Checklist