Merge pull request #1001 from ijc/nuke-getTempDir

ctr: Remove getTempDir
This commit is contained in:
Michael Crosby 2017-06-14 09:06:29 -07:00 committed by GitHub
commit 7dbf26ecf6

View File

@ -4,10 +4,8 @@ import (
gocontext "context"
"encoding/csv"
"fmt"
"io/ioutil"
"os"
"os/signal"
"path/filepath"
"strconv"
"strings"
"syscall"
@ -131,18 +129,6 @@ func getVersionService(context *cli.Context) (versionservice.VersionClient, erro
return versionservice.NewVersionClient(conn), nil
}
func getTempDir(id string) (string, error) {
err := os.MkdirAll(filepath.Join(os.TempDir(), "ctr"), 0700)
if err != nil {
return "", err
}
tmpDir, err := ioutil.TempDir(filepath.Join(os.TempDir(), "ctr"), fmt.Sprintf("%s-", id))
if err != nil {
return "", err
}
return tmpDir, nil
}
func waitContainer(events execution.Tasks_EventsClient, id string, pid uint32) (uint32, error) {
for {
e, err := events.Recv()