diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index 8e2bee16602b0c6f632d1e7ee7306dd1ad323e89..5ae5f85b02a80a07225dfec396b01a55e4a7f726 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -93,6 +93,7 @@ func (d *Driver) Create() error { glog.Infof("Unable to create preloaded images volume: %v", err) } params.PreloadedVolume = volumeName + fmt.Println("Setting params.preloadedvolume = ", volumeName) err = oci.CreateContainerNode(params) if err != nil { return errors.Wrap(err, "create kic node") diff --git a/pkg/drivers/kic/oci/volumes.go b/pkg/drivers/kic/oci/volumes.go index 8a13fef5280c17407f5deb13d70e4652ba5a7903..30151b8807c6e63e1efec0bd80b77a41a087ebcf 100644 --- a/pkg/drivers/kic/oci/volumes.go +++ b/pkg/drivers/kic/oci/volumes.go @@ -22,11 +22,11 @@ import ( "fmt" "os/exec" "path" - "path/filepath" "strings" "github.com/golang/glog" "github.com/pkg/errors" + "k8s.io/minikube/pkg/minikube/localpath" ) // DeleteAllVolumesByLabel deletes all volumes that have a specific label @@ -102,7 +102,7 @@ func CreatePreloadedImagesVolume(k8sVersion string) (string, error) { if err := createDockerVolume(volumeName); err != nil { return "", errors.Wrap(err, "creating docker volume") } - targetDir := filepath.Join("cache", "preloaded-tarball") + targetDir := localpath.MakeMiniPath("cache", "preloaded-tarball") tarballPath := path.Join(targetDir, fmt.Sprintf("%s.tar", k8sVersion)) if err := extractTarballToVolume(tarballPath, volumeName); err != nil { @@ -133,7 +133,7 @@ func extractTarballToVolume(tarballPath, volumeName string) error { if err := PointToHostDockerDaemon(); err != nil { return errors.Wrap(err, "point host docker-daemon") } - cmd := exec.Command(Docker, "-v", fmt.Sprintf("%s:/preloaded.tar:ro", tarballPath), "-v", fmt.Sprintf("%s:/extractDir", volumeName), "busybox", "tar", "xvf", "/preloaded.tar", "-C", "/extractDir") + cmd := exec.Command(Docker, "run", "-v", fmt.Sprintf("%s:/preloaded.tar:ro", tarballPath), "-v", fmt.Sprintf("%s:/extractDir", volumeName), "busybox", "tar", "xvf", "/preloaded.tar", "-C", "/extractDir") fmt.Println(cmd.Args) if out, err := cmd.CombinedOutput(); err != nil { return errors.Wrapf(err, "output %s", string(out))