Skip to content

Commit 4ea93f0

Browse files
committed
Expose docker client configuration
1 parent 21befb2 commit 4ea93f0

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Add the following to your `pom.xml`:
102102
<dependency>
103103
<groupId>com.arakelian</groupId>
104104
<artifactId>docker-junit-rule</artifactId>
105-
<version>4.0.7</version>
105+
<version>4.1.0</version>
106106
<scope>test</scope>
107107
</dependency>
108108
```
@@ -117,7 +117,7 @@ repositories {
117117
}
118118
119119
dependencies {
120-
testCompile 'com.arakelian:docker-junit-rule:4.0.7'
120+
testCompile 'com.arakelian:docker-junit-rule:4.1.0'
121121
}
122122
```
123123

src/main/java/com/arakelian/docker/junit/Container.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,8 @@ private String createContainer() {
292292

293293
protected DockerClient createDockerClient() throws DockerClientException {
294294
try {
295-
final DockerClient dockerClient = DockerClientImpl.getInstance() //
295+
final DockerClient dockerClient = DockerClientImpl //
296+
.getInstance(config.getDockerClientConfig()) //
296297
.withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory());
297298
return dockerClient;
298299
} catch (final IllegalStateException | IllegalArgumentException e) {

src/main/java/com/arakelian/docker/junit/model/DockerConfig.java

+8
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import org.immutables.value.Value;
2525

26+
import com.github.dockerjava.core.DefaultDockerClientConfig;
27+
import com.github.dockerjava.core.DockerClientConfig;
2628
import com.google.common.collect.ImmutableList;
2729

2830
/**
@@ -70,6 +72,12 @@ public List<HostConfigConfigurer> getHostConfigConfigurer() {
7072
*/
7173
public abstract String getImage();
7274

75+
@Value.Default
76+
@Value.Auxiliary
77+
public DockerClientConfig getDockerClientConfig() {
78+
return DefaultDockerClientConfig.createDefaultConfigBuilder().build();
79+
}
80+
7381
/**
7482
* Returns a list of listeners which are called when the container is started.
7583
*

0 commit comments

Comments
 (0)