diff options
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index 05fe692ce7a..e5607bd0863 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -124,6 +124,7 @@ public class DockerImpl implements Docker { private void setupDockerNetworkIfNeeded() throws IOException, InterruptedException { if (! dockerClient.listNetworksCmd().withNameFilter(DOCKER_CUSTOM_MACVLAN_NETWORK_NAME).exec().isEmpty()) return; + // Use IPv6 address if there is a mix of IP4 and IPv6 by taking the longest address. List<InetAddress> hostAddresses = Arrays.asList(InetAddress.getAllByName(com.yahoo.net.HostName.getLocalhost())); InetAddress hostAddress = Collections.max(hostAddresses, (o1, o2) -> o1.getAddress().length - o2.getAddress().length); @@ -144,7 +145,6 @@ public class DockerImpl implements Docker { .withDriver("macvlan") .withEnableIpv6(true) .withIpam(ipam) - .withCheckDuplicate(true) .withOptions(dockerNetworkOptions) .exec(); } |