diff options
author | Martin Polden <martin.polden@gmail.com> | 2017-06-12 11:17:13 +0200 |
---|---|---|
committer | Martin Polden <martin.polden@gmail.com> | 2017-06-12 11:34:59 +0200 |
commit | 81be9eb7c62743fb9245f6e73a8a844f50e06e3f (patch) | |
tree | 2aaf1281419ad738e4323acab8ea2ce20ac44c36 /config-provisioning/src/main/java/com/yahoo | |
parent | 44352dabe868bccf2aab2db0f426a88b5ed3c27a (diff) |
Use config to specify Docker image in node-repository
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java | 4 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java index 19fcce4b965..b7c942168d6 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java @@ -37,10 +37,6 @@ public final class ClusterSpec { public Version vespaVersion() { return vespaVersion; } - public String dockerImage() { - return DockerImage.defaultImage.withTag(vespaVersion).toString(); - } - /** Returns the group within the cluster this specifies, or empty to specify the whole cluster */ public Optional<Group> group() { return groupId; } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java b/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java index 2c6c9d82419..ba60e42e7d6 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/DockerImage.java @@ -10,8 +10,6 @@ import com.yahoo.component.Version; */ public class DockerImage { - public static final DockerImage defaultImage = new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/ci"); - private final String name; public DockerImage(String name) { @@ -20,9 +18,9 @@ public class DockerImage { /** Get Docker image tag as version */ public Version tagAsVersion() { - String[] parts = toString().split(":"); + String[] parts = asString().split(":"); if (parts.length < 2) { - throw new IllegalArgumentException("Could not parse tag from Docker image '" + toString() + "'"); + throw new IllegalArgumentException("Could not parse tag from Docker image '" + asString() + "'"); } return Version.fromString(parts[parts.length - 1]); } @@ -32,8 +30,8 @@ public class DockerImage { return new DockerImage(name + ":" + version.toFullString()); } - @Override - public String toString() { + public String asString() { return name; } + } |