Skip to content

Commit e0275e0

Browse files
ziminghuabsideup
andauthored
Use npipe as the default DOCKER_HOST on Windows (#1701)
* support default config by windows if os is windows use windows default host * Update DefaultDockerClientConfig.java Co-authored-by: Sergei Egorov <bsideup@gmail.com>
1 parent de2627d commit e0275e0

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.github.dockerjava.core.NameParser.HostnameReposName;
77
import com.github.dockerjava.core.NameParser.ReposTag;
88
import org.apache.commons.lang.StringUtils;
9+
import org.apache.commons.lang.SystemUtils;
910
import org.apache.commons.lang.builder.EqualsBuilder;
1011
import org.apache.commons.lang.builder.HashCodeBuilder;
1112
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -60,6 +61,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
6061

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

64+
static final String WINDOWS_DEFAULT_DOCKER_HOST = "npipe:////./pipe/docker_engine";
65+
6366
static {
6467
CONFIG_KEYS.add(DOCKER_HOST);
6568
CONFIG_KEYS.add(DOCKER_TLS_VERIFY);
@@ -444,7 +447,9 @@ public DefaultDockerClientConfig build() {
444447
sslConfig = customSslConfig;
445448
}
446449

447-
URI dockerHostUri = (dockerHost != null) ? dockerHost : URI.create(DEFAULT_DOCKER_HOST);
450+
URI dockerHostUri = dockerHost != null
451+
? dockerHost
452+
: URI.create(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST);
448453

449454
return new DefaultDockerClientConfig(dockerHostUri, dockerConfig, apiVersion, registryUrl, registryUsername,
450455
registryPassword, registryEmail, sslConfig);

0 commit comments

Comments
 (0)