summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorJon Bratseth <jonbratseth@yahoo.com>2017-06-13 09:51:04 +0200
committerGitHub <noreply@github.com>2017-06-13 09:51:04 +0200
commit9fe6a9f635a5277d6d6c58ccbe5b279449e016c1 (patch)
treea16899b03d336a723d7b380d444762aeeee7ba60 /node-admin
parent344730820bb8e6f23eb0784a0dd4b469657ab49e (diff)
parent8c1140d954d8e82520bdfe9310edcfd5bebbbb40 (diff)
Merge pull request #2702 from yahoo/mpolden/docker-image-config
Docker image config
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/README.md2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImplTest.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/node-admin/README.md b/node-admin/README.md
index 8352cbd3c43..bab4c17ffbf 100644
--- a/node-admin/README.md
+++ b/node-admin/README.md
@@ -31,7 +31,7 @@ implements all of the basic methods you need to get started.
To start a local zone, simply run:
```
- DockerImage dockerImage = new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/ci:6.111.21");
+ DockerImage dockerImage = new DockerImage("docker-registry.domain.tld:8080/vespa/ci:6.111.21");
Path pathToVespaRoot = Paths.get("/home/valerijf/dev/vespa");
Path pathToContainerStorage = Paths.get("/home/docker/container-storage");
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImplTest.java
index 15dce02f336..f5f98910694 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImplTest.java
@@ -83,14 +83,14 @@ public class NodeRepositoryImplTest {
}
@Test
- public void testGetContainersToRunAPi() throws IOException, InterruptedException {
+ public void testGetContainersToRunApi() throws IOException, InterruptedException {
waitForJdiscContainerToServe();
NodeRepository nodeRepositoryApi = new NodeRepositoryImpl(requestExecutor, port, "dockerhost4");
final List<ContainerNodeSpec> containersToRun = nodeRepositoryApi.getContainersToRun();
assertThat(containersToRun.size(), is(1));
final ContainerNodeSpec nodeSpec = containersToRun.get(0);
assertThat(nodeSpec.hostname, is("host4.yahoo.com"));
- assertThat(nodeSpec.wantedDockerImage.get(), is(new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0")));
+ assertThat(nodeSpec.wantedDockerImage.get(), is(new DockerImage("docker-registry.domain.tld:8080/dist/vespa:6.42.0")));
assertThat(nodeSpec.nodeState, is(Node.State.reserved));
assertThat(nodeSpec.wantedRestartGeneration.get(), is(0L));
assertThat(nodeSpec.currentRestartGeneration.get(), is(0L));