Fix UnixSocketClientProviderStrategy ignoring DOCKER_HOST env var fixes #11254 #11255
+46
−4
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.
Context
In the current implementation (v2.x),
UnixSocketClientProviderStrategyhardcodes the socket path to/var/run/docker.sock. It completely ignores theDOCKER_HOSTenvironment variable.This is a regression that prevents users (especially those using Podman or rootless Docker) from running tests if other strategies fail and the system falls back to this strategy.
Changes
getTransportConfiginUnixSocketClientProviderStrategy.javato check for theDOCKER_HOSTenvironment variable before defaulting to the hardcoded path.finalmodifier fromUnixSocketClientProviderStrategyand extracted environment variable access to aprotectedmethod (getDockerHostEnv). This was necessary to make the class testable via partial mocking.shouldRespectDockerHostEnvVarinUnixSocketClientProviderStrategyTestthat verifies the fix by simulating a custom socket path.Verification
I verified the fix locally using the added unit test, which fails without the fix and passes with it. I also ran
spotlessApplyto ensure code style compliance.Fixes #11254