Skip to content
Merged
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
static final Properties DEFAULT_PROPERTIES = new Properties();

static final String DEFAULT_DOCKER_HOST = "unix:///var/run/docker.sock";

static final String WINDOWS_DEFAULT_DOCKER_HOST = "npipe:////./pipe/docker_engine";

static {
CONFIG_KEYS.add(DOCKER_HOST);
Expand Down Expand Up @@ -444,7 +446,8 @@ public DefaultDockerClientConfig build() {
sslConfig = customSslConfig;
}

URI dockerHostUri = (dockerHost != null) ? dockerHost : URI.create(DEFAULT_DOCKER_HOST);
String defaultHost = SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST;
URI dockerHostUri = (dockerHost != null) ? dockerHost : URI.create(defaultHost);

return new DefaultDockerClientConfig(dockerHostUri, dockerConfig, apiVersion, registryUrl, registryUsername,
registryPassword, registryEmail, sslConfig);
Expand Down