aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2016-10-26 08:36:55 +0200
committerHarald Musum <musum@yahoo-inc.com>2016-10-26 08:36:55 +0200
commit90bc5ba0e2bb463a6eec2eaa4d90f8da1c76bb17 (patch)
tree78b5f6e90867d95ebda457ea7e5a05cbcf0984a2 /node-admin
parent1f3ebc60f032dbf2b6170955f18d018a7c98b7cd (diff)
Remove explicit mention of base image, set in environment value
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java
index ec5717f65b7..20309132a76 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/RunVespaLocal.java
@@ -36,9 +36,10 @@ import static org.mockito.Mockito.when;
* To get started:
* 1. Add config-server and container nodes hostnames to /etc/hosts:
* $ sudo ./vespa/node-admin/scripts/etc-hosts.sh
- * 2. Set environmental variables:
+ * 2. Set environmental variables in shell or e.g. ~/.bashrc:
* VESPA_HOME="/home/y"
* VESPA_WEB_SERVICE_PORT="4080"
+ * VESPA_BASE_IMAGE="<vespa image>"
* 3. Create /home/docker/container-storage with read/write permissions
* 4. Update {@link RunVespaLocal#appPath} to point to the application you want deployed
* 5. Specify base image (see below) and download it with "docker pull <image>"
@@ -50,8 +51,7 @@ import static org.mockito.Mockito.when;
* @author freva
*/
public class RunVespaLocal {
- private static final DockerImage vespaBaseImage =
- new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/ci:6.40.185");
+ private static final DockerImage vespaBaseImage = new DockerImage(System.getenv("VESPA_BASE_IMAGE"));
private static final Environment environment = new Environment(
Collections.singleton(LocalZoneUtils.CONFIG_SERVER_HOSTNAME), "prod", "vespa-local",
HostName.getLocalhost(), new InetAddressResolver());