diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2018-08-29 20:13:06 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerij92@gmail.com> | 2018-08-29 23:36:54 +0200 |
commit | 4c99eaaf9d92ebe889b5229e25e6946e849a441e (patch) | |
tree | 76e05b8711f525626cfa79ad30bb4189c37228df /docker-api/src | |
parent | 103516173220c9bb845a9fdbf3113ed986816e51 (diff) |
Remove getGlobalIPv6Address(ContainerName)
Diffstat (limited to 'docker-api/src')
-rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java | 2 | ||||
-rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 9 |
2 files changed, 0 insertions, 11 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java index fc7282e2be5..98c5fe5a8a6 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java @@ -114,6 +114,4 @@ public interface Docker { * @return exitcodes, stdout and stderr in the ProcessResult */ ProcessResult executeInContainerAsRoot(ContainerName containerName, Long timeoutSeconds, String... command); - - String getGlobalIPv6Address(ContainerName name); } 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 3d01552b21e..dd241ad2c6a 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 @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.dockerapi; import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.ExecCreateCmdResponse; import com.github.dockerjava.api.command.ExecStartCmd; -import com.github.dockerjava.api.command.InspectContainerCmd; import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.command.InspectExecResponse; import com.github.dockerjava.api.command.InspectImageResponse; @@ -27,7 +26,6 @@ import com.yahoo.vespa.hosted.dockerapi.metrics.CounterWrapper; import com.yahoo.vespa.hosted.dockerapi.metrics.Dimensions; import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper; -import javax.annotation.concurrent.GuardedBy; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.Inet6Address; @@ -64,7 +62,6 @@ public class DockerImpl implements Docker { private boolean started = false; private final Object monitor = new Object(); - @GuardedBy("monitor") private final Set<DockerImage> scheduledPulls = new HashSet<>(); private DockerClient dockerClient; @@ -362,12 +359,6 @@ public class DockerImpl implements Docker { return asContainer(containerName.asString()).findFirst(); } - @Override - public String getGlobalIPv6Address(ContainerName name) { - InspectContainerCmd cmd = dockerClient.inspectContainerCmd(name.asString()); - return cmd.exec().getNetworkSettings().getGlobalIPv6Address(); - } - private Stream<Container> asContainer(String container) { return inspectContainerCmd(container) .map(response -> |