From dd1a0289212e3b2305ccb7e29a00d896f79ab93c Mon Sep 17 00:00:00 2001 From: Cesar Wong Date: Mon, 23 Jan 2017 21:08:34 -0500 Subject: [PATCH] cluster up: fix Windows config file upload Uses the path (unix-style) package instead of filepath (platform-specific) for creating the config file upload path for the origin container. --- pkg/bootstrap/docker/dockerhelper/filetransfer.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/bootstrap/docker/dockerhelper/filetransfer.go b/pkg/bootstrap/docker/dockerhelper/filetransfer.go index 9995447b9a62..5c2f49e9e258 100644 --- a/pkg/bootstrap/docker/dockerhelper/filetransfer.go +++ b/pkg/bootstrap/docker/dockerhelper/filetransfer.go @@ -6,6 +6,7 @@ import ( "io" "io/ioutil" "os" + "path" "path/filepath" "strings" @@ -122,12 +123,12 @@ func DownloadDirFromContainer(client *docker.Client, container, src, dst string) // UploadFileToContainer uploads a file to a remote container. func UploadFileToContainer(client *docker.Client, container, src, dest string) error { - uploader, errch := newContainerUploader(client, container, filepath.Dir(dest)) + uploader, errch := newContainerUploader(client, container, path.Dir(dest)) nullWalkFunc := func(path string, info os.FileInfo, err error) error { return err } t := stitar.New() - err := t.StreamFileAsTarWithCallback(src, filepath.Base(dest), uploader, nullWalkFunc, false) + err := t.StreamFileAsTarWithCallback(src, path.Base(dest), uploader, nullWalkFunc, false) uploader.Close() if err != nil { return err