Skip to content

[Enhancement] add option to use dockerContext as a configuration for the EnvironmentAndSystemPropertyClientProviderStrategy #12099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
swermin wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[Enhancement] add option to use dockerContext as a configuration for the EnvironmentAndSystemPropertyClientProviderStrategy #12099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
204821e
add option to use dockerContext as configuration
swermin Oct 3, 2026
e78538f
add docs to specify that dockerContext can be used
swermin Oct 3, 2026
f3bc6b3
add comments to explain that the dockerContext option relies on docke…
swermin Oct 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...a/org/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ public EnvironmentAndSystemPropertyClientProviderStrategy() {
case "autoIgnoringUserProperties":
applicable = configBuilder.isDockerHostSetExplicitly();
break;
case "dockerContext":

@piotrwielgolaski-tomtom piotrwielgolaski-tomtom Oct 11, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this approach, few years back I proposed to relax autoIgnoringUserProperties
https://github.com/testcontainers/testcontainers-java/pull/7178/changes
but this would also works.
@eddumelendez @kiview could you take a look at this and propose acceptable for you solution?

// none of the Testcontainers configuration are relevant when using docker contexts since we rely
// on the docker-java default to have all the necessary configuration already set.
applicable = true;
break;
default:
throw new InvalidConfigurationException("Invalid value for dockerconfig.source: " + dockerConfigSource);
}
Expand Down
16 changes: 16 additions & 0 deletions ...g/testcontainers/dockerclient/EnvironmentAndSystemPropertyClientProviderStrategyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,20 @@ void notApplicableWhenIgnoringUserPropertiesAndNotConfigured() {

assertThat(strategy.isApplicable()).isFalse();
}

@Test
void applicableWhenUsingDockerContext() {
Mockito
.doReturn("dockerContext")
.when(TestcontainersConfiguration.getInstance())
.getEnvVarOrProperty(eq("dockerconfig.source"), anyString());

Properties oldProperties = System.getProperties();
try {
EnvironmentAndSystemPropertyClientProviderStrategy strategy = new EnvironmentAndSystemPropertyClientProviderStrategy();
assertThat(strategy.isApplicable()).isTrue();
} finally {
System.setProperties(oldProperties);
}
}
}
8 changes: 8 additions & 0 deletions docs/features/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,11 @@ In addition, you can deactivate this behaviour by specifying:
```properties
dockerconfig.source=autoIgnoringUserProperties # 'auto' by default
```

## Docker Context support

For users who wants to use docker context for host configuration can set the following property:
```properties
dockerconfig.source=dockerContext # 'auto' by default
```
Warning, this option will not do any extra checks, it defaults to whatever is configured through docker and/or docker context
Loading