提交 055e4bb6 编写于 作者: P Priya Wadhwa

Add run to docker command

上级 335637f4
......@@ -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")
......
......@@ -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))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册