aboutsummaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
authorfreva <valerijf@yahoo-inc.com>2016-12-02 10:42:41 +0100
committerfreva <valerijf@yahoo-inc.com>2016-12-02 10:42:41 +0100
commitb3eaf85a2635d8118d95a689ff5361df26baaeb1 (patch)
tree4bc73fc854311704e3deb927a4da488c4189331d /docker-api
parentb118c2ddaa61500694644983e2f2a532ea3ff7e8 (diff)
Copy /etc/hosts to systest docker container
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java
index 84eeaab83e3..c4c506c0ac1 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/RunSystemTests.java
@@ -141,12 +141,14 @@ public class RunSystemTests {
.withUlimit("nproc", 409600, 409600)
.withUlimit("core", -1, -1)
.withVolume(Paths.get(System.getProperty("user.home")).resolve(".m2/settings.xml").toString(), "/root/.m2/settings.xml")
- .withVolume("/etc/hosts", "/etc/hosts")
.withVolume(pathToSystemtestsInHost.toString(), pathToSystemtestsInContainer.toString())
.withVolume(pathToVespaRepoInHost.toString(), pathToVespaRepoInContainer.toString())
.create();
docker.startContainer(containerName);
+ docker.dockerClient.copyArchiveToContainerCmd(containerName.asString())
+ .withHostResource("/etc/hosts").withRemotePath("/etc/").exec();
+
// TODO: Should check something to see if node_server.rb is ready
Thread.sleep(1000);
}