Merge pull request #6710 from synarete/minikube-script-fixes

Minikube script fixes

tests/scripts/minikube.sh

@@ -20,7 +20,11 @@ function wait_for_ssh() {
 function copy_image_to_cluster() {
     local build_image=$1
     local final_image=$2
-    docker save "${build_image}" | (eval "$(minikube docker-env --shell bash)" && docker load && docker tag "${build_image}" "${final_image}")
+    local docker_env_tag="${DOCKERCMD}-env"
+    ${DOCKERCMD} save "${build_image}" | \
+        (eval "$(minikube ${docker_env_tag} --shell bash)" && \
+        ${DOCKERCMD} load && \
+        ${DOCKERCMD} tag "${build_image}" "${final_image}")
 }
 
 function copy_images() {
@@ -56,7 +60,7 @@ function copy_images() {
 MEMORY=${MEMORY:-"3000"}
 
 # use vda1 instead of sda1 when running with the libvirt driver
-VM_DRIVER=$(minikube config get vm-driver 2>/dev/null || echo "virtualbox")
+VM_DRIVER=$(minikube config get driver 2>/dev/null || echo "virtualbox")
 if [[ "$VM_DRIVER" == "kvm2" ]]; then
   DISK="vda1"
 else