Merge pull request #3611 from phlogistonjohn/jjm-support-non-docker-in-tests

tests: do not require actual docker cli
This commit is contained in:
Travis Nielsen authored and GitHub committed 2019-08-13 21:23:48 -06:00
commit 35adf26d79
1 file changed
+5 -1
+5 -1
View File
@@ -105,7 +105,11 @@ func (k8sh *K8sHelper) MakeContext() *clusterd.Context {
}
func (k8sh *K8sHelper) GetDockerImage(image string) error {
return k8sh.executor.ExecuteCommand(false, "", "docker", "pull", image)
dockercmd := os.Getenv("DOCKERCMD")
if dockercmd == "" {
dockercmd = "docker"
}
return k8sh.executor.ExecuteCommand(false, "", dockercmd, "pull", image)
}
// SetDeploymentVersion sets the container version on the deployment. It is assumed to be the rook/ceph image.