Use implicit strategy when docker.host configuration is set
#4175
Conversation
This file contains 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
bsideup
reviewed
Jul 16, 2021
| } | ||
|
|
||
| // looks for unprefixed env var or unprefixed property | ||
| String unprefixedEnvVarOrProperty = getEnvVarOrUserProperty("docker.client.strategy", null); |
There was a problem hiding this comment.
previous implementation was prioritizing this over TESTCONTAINERS_DOCKER_CLIENT_STRATEGY
There was a problem hiding this comment.
BTW I am surprised why the tests are passing :D
There was a problem hiding this comment.
Oh interesting; I'll add some more checks in the tests, but actually I think this order is better: we currently check env vars before properties anyway.
A. Currently in this PR the check order is:
TESTCONTAINERS_DOCKER_CLIENT_STRATEGY
DOCKER_CLIENT_STRATEGY
docker.client.strategy
B. Whereas previously in this PR it went:
DOCKER_CLIENT_STRATEGY
docker.client.strategy
TESTCONTAINERS_DOCKER_CLIENT_STRATEGY
C. Compared with the last release version:
TESTCONTAINERS_DOCKER_CLIENT_STRATEGY
docker.client.strategy
It would feel weird if we prioritise environment variables over properties in some cases but not this one, so I think this is more correct. A is more compatible with C than B was.
bsideup
approved these changes
Jul 16, 2021
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.
No description provided.