Fallback to using docker-image

1 files changed, 3 insertions, 2 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
index 01ef305034d..56e27daa714 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
@@ -28,6 +28,7 @@ public class ProvisionInfo {
     private static final String hostSpecMembership = "membership";
     private static final String hostSpecFlavor = "flavor";
     private static final String hostSpecVespaVersion = "vespaVersion";
+    private static final String dockerImage = "dockerImage";
 
     private final Set<HostSpec> hosts = new LinkedHashSet<>();
 
@@ -83,11 +84,11 @@ public class ProvisionInfo {
     }
 
     private static ClusterMembership readMembership(Inspector object) {
-        // TODO: When no version older than 6.97 is present anywhere, remove the possibility of the version field missing
+        // TODO: When no version older than 6.97 is present anywhere, remove the possibility of the version field missing (and hence also remove reading of dockerImage)
         return ClusterMembership.from(object.field(hostSpecMembership).asString(),
                                       object.field(hostSpecVespaVersion).valid() ? 
                                       com.yahoo.component.Version.fromString(object.field(hostSpecVespaVersion).asString()) :
-                                      Vtag.currentVersion);
+                                      ( object.field(dockerImage).valid() ? com.yahoo.component.Version.fromString(object.field(dockerImage).asString()) : Vtag.currentVersion));
     }
 
     private static Optional<Flavor> readFlavor(Inspector object, Optional<NodeFlavors> nodeFlavors) {