diff options
author | toby <smorgrav@yahoo-inc.com> | 2018-01-22 12:49:22 +0100 |
---|---|---|
committer | toby <smorgrav@yahoo-inc.com> | 2018-01-22 12:49:22 +0100 |
commit | b0c58d1e6568d563c2ec47362d5e0367fe6067ed (patch) | |
tree | c04bc1cf07338244ffcec17844a4840a65aee07d /docker-api | |
parent | a948a5ef3493c26fc30a0a8f93d63cbd9497da3b (diff) |
Revert adding extraHosts to docker - use iptables instead
Diffstat (limited to 'docker-api')
-rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java | 8 | ||||
-rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java index 62bc78dcfce..5d1526b1873 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java @@ -39,7 +39,6 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand { private Optional<String[]> entrypoint = Optional.empty(); private Set<Capability> addCapabilities = new HashSet<>(); private Set<Capability> dropCapabilities = new HashSet<>(); - private List<String> extraHosts = new ArrayList<>(); CreateContainerCommandImpl(DockerClient docker, DockerImage dockerImage, @@ -110,12 +109,6 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand { } @Override - public Docker.CreateContainerCommand withExtraHost(String hostname, String ip) { - extraHosts.add(hostname + ":" + ip); - return this; - } - - @Override public Docker.CreateContainerCommand withIpAddress(InetAddress address) { if (address instanceof Inet6Address) { ipv6Address = Optional.of(address.getHostAddress()); @@ -146,7 +139,6 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand { .withLabels(labels) .withEnv(environmentAssignments) .withBinds(volumeBinds) - .withExtraHosts(extraHosts) .withUlimits(ulimits) .withCapAdd(new ArrayList<>(addCapabilities)) .withCapDrop(new ArrayList<>(dropCapabilities)); 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 9b9a5bf35d4..00493e3e016 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 @@ -28,7 +28,6 @@ public interface Docker { CreateContainerCommand withManagedBy(String manager); CreateContainerCommand withAddCapability(String capabilityName); CreateContainerCommand withDropCapability(String capabilityName); - CreateContainerCommand withExtraHost(String hostname, String ip); void create(); } |