Merge pull request #4 from experimental-platform/hh-fix-dockerutil

Make `GetContainerIP` work in testing environments.
experimental-platform · Sep 29, 2016 · 85666f4 · 85666f4
2 parents 81d2138 + d6c0071
commit 85666f4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/dockerutil/dockerutil.go b/dockerutil/dockerutil.go
@@ -34,7 +34,10 @@ func GetContainerIP(name string) (string, error) {
 
 	protonetNetworkData, ok := data.NetworkSettings.Networks["protonet"]
 	if !ok {
-		return "", errors.New("The SKVS container doesn't belong to the network 'protonet'.")
+		protonetNetworkData, ok = data.NetworkSettings.Networks["docker"]
+		if !ok {
+			return "", fmt.Errorf("The container '%s' doesn't exist on the networks 'protonet' and 'docker'.", name)
+		}
 	}
 
 	return protonetNetworkData.IPAddress, nil