Merge pull request #2325 from cloudfoundry-incubator/pr-tempdir

crosbymichael · web-flow · commit 08b43d9200a2 · 2018-05-04T10:25:00.000-04:00
Use user-specific temp directory if set
diff --git a/archive/tar.go b/archive/tar.go
@@ -199,7 +199,7 @@ func applyNaive(ctx context.Context, root string, tr *tar.Reader, options ApplyO
 				basename := filepath.Base(hdr.Name)
 				aufsHardlinks[basename] = hdr
 				if aufsTempdir == "" {
-					if aufsTempdir, err = ioutil.TempDir("", "dockerplnk"); err != nil {
+					if aufsTempdir, err = ioutil.TempDir(os.Getenv("XDG_RUNTIME_DIR"), "dockerplnk"); err != nil {
 						return 0, err
 					}
 					defer os.RemoveAll(aufsTempdir)
diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go
@@ -506,7 +506,7 @@ var (
 )
 
 func edit(rd io.Reader) (io.ReadCloser, error) {
-	tmp, err := ioutil.TempFile("", "edit-")
+	tmp, err := ioutil.TempFile(os.Getenv("XDG_RUNTIME_DIR"), "edit-")
 	if err != nil {
 		return nil, err
 	}
diff --git a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go
@@ -53,7 +53,7 @@ func WithDefaultProfile(name string) oci.SpecOpts {
 		if err != nil {
 			return err
 		}
-		f, err := ioutil.TempFile("", p.Name)
+		f, err := ioutil.TempFile(os.Getenv("XDG_RUNTIME_DIR"), p.Name)
 		if err != nil {
 			return err
 		}
diff --git a/mount/temp.go b/mount/temp.go
@@ -25,7 +25,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-var tempMountLocation = os.TempDir()
+var tempMountLocation = getTempDir()
 
 // WithTempMount mounts the provided mounts to a temp dir, and pass the temp dir to f.
 // The mounts are valid during the call to the f.
@@ -64,3 +64,10 @@ func WithTempMount(ctx context.Context, mounts []Mount, f func(root string) erro
 	}
 	return errors.Wrapf(f(root), "mount callback failed on %s", root)
 }
+
+func getTempDir() string {
+	if xdg := os.Getenv("XDG_RUNTIME_DIR"); xdg != "" {
+		return xdg
+	}
+	return os.TempDir()
+}
diff --git a/rootfs/init.go b/rootfs/init.go
@@ -75,7 +75,7 @@ func createInitLayer(ctx context.Context, parent, initName string, initFn func(s
 	// TODO: ensure not exist error once added to snapshot package
 
 	// Create tempdir
-	td, err := ioutil.TempDir("", "create-init-")
+	td, err := ioutil.TempDir(os.Getenv("XDG_RUNTIME_DIR"), "create-init-")
 	if err != nil {
 		return "", err
 	}
diff --git a/services/tasks/local.go b/services/tasks/local.go
@@ -114,7 +114,7 @@ func (l *local) Create(ctx context.Context, r *api.CreateTaskRequest, _ ...grpc.
 		err            error
 	)
 	if r.Checkpoint != nil {
-		checkpointPath, err = ioutil.TempDir("", "ctrd-checkpoint")
+		checkpointPath, err = ioutil.TempDir(os.Getenv("XDG_RUNTIME_DIR"), "ctrd-checkpoint")
 		if err != nil {
 			return nil, err
 		}
@@ -450,7 +450,7 @@ func (l *local) Checkpoint(ctx context.Context, r *api.CheckpointTaskRequest, _
 	if err != nil {
 		return nil, err
 	}
-	image, err := ioutil.TempDir("", "ctd-checkpoint")
+	image, err := ioutil.TempDir(os.Getenv("XDG_RUNTIME_DIR"), "ctd-checkpoint")
 	if err != nil {
 		return nil, errdefs.ToGRPC(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ func applyNaive(ctx context.Context, root string, tr *tar.Reader, options ApplyO`
`199`	`199`	`basename := filepath.Base(hdr.Name)`
`200`	`200`	`aufsHardlinks[basename] = hdr`
`201`	`201`	`if aufsTempdir == "" {`
`202`		`- if aufsTempdir, err = ioutil.TempDir("", "dockerplnk"); err != nil {`
	`202`	`+ if aufsTempdir, err = ioutil.TempDir(os.Getenv("XDG_RUNTIME_DIR"), "dockerplnk"); err != nil {`
`203`	`203`	`return 0, err`
`204`	`204`	`}`
`205`	`205`	`defer os.RemoveAll(aufsTempdir)`
Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ var (`
`506`	`506`	`)`
`507`	`507`
`508`	`508`	`func edit(rd io.Reader) (io.ReadCloser, error) {`
`509`		`- tmp, err := ioutil.TempFile("", "edit-")`
	`509`	`+ tmp, err := ioutil.TempFile(os.Getenv("XDG_RUNTIME_DIR"), "edit-")`
`510`	`510`	`if err != nil {`
`511`	`511`	`return nil, err`
`512`	`512`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func WithDefaultProfile(name string) oci.SpecOpts {`
`53`	`53`	`if err != nil {`
`54`	`54`	`return err`
`55`	`55`	`}`
`56`		`- f, err := ioutil.TempFile("", p.Name)`
	`56`	`+ f, err := ioutil.TempFile(os.Getenv("XDG_RUNTIME_DIR"), p.Name)`
`57`	`57`	`if err != nil {`
`58`	`58`	`return err`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"github.com/pkg/errors"`
`26`	`26`	`)`
`27`	`27`
`28`		`-var tempMountLocation = os.TempDir()`
	`28`	`+var tempMountLocation = getTempDir()`
`29`	`29`
`30`	`30`	`// WithTempMount mounts the provided mounts to a temp dir, and pass the temp dir to f.`
`31`	`31`	`// The mounts are valid during the call to the f.`
`@@ -64,3 +64,10 @@ func WithTempMount(ctx context.Context, mounts []Mount, f func(root string) erro`
`64`	`64`	`}`
`65`	`65`	`return errors.Wrapf(f(root), "mount callback failed on %s", root)`
`66`	`66`	`}`
	`67`	`+`
	`68`	`+func getTempDir() string {`
	`69`	`+ if xdg := os.Getenv("XDG_RUNTIME_DIR"); xdg != "" {`
	`70`	`+ return xdg`
	`71`	`+ }`
	`72`	`+ return os.TempDir()`
	`73`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func createInitLayer(ctx context.Context, parent, initName string, initFn func(s`
`75`	`75`	`// TODO: ensure not exist error once added to snapshot package`
`76`	`76`
`77`	`77`	`// Create tempdir`
`78`		`- td, err := ioutil.TempDir("", "create-init-")`
	`78`	`+ td, err := ioutil.TempDir(os.Getenv("XDG_RUNTIME_DIR"), "create-init-")`
`79`	`79`	`if err != nil {`
`80`	`80`	`return "", err`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (l local) Create(ctx context.Context, r api.CreateTaskRequest, _ ...grpc.`
`114`	`114`	`err error`
`115`	`115`	`)`
`116`	`116`	`if r.Checkpoint != nil {`
`117`		`- checkpointPath, err = ioutil.TempDir("", "ctrd-checkpoint")`
	`117`	`+ checkpointPath, err = ioutil.TempDir(os.Getenv("XDG_RUNTIME_DIR"), "ctrd-checkpoint")`
`118`	`118`	`if err != nil {`
`119`	`119`	`return nil, err`
`120`	`120`	`}`
`@@ -450,7 +450,7 @@ func (l local) Checkpoint(ctx context.Context, r api.CheckpointTaskRequest, _`
`450`	`450`	`if err != nil {`
`451`	`451`	`return nil, err`
`452`	`452`	`}`
`453`		`- image, err := ioutil.TempDir("", "ctd-checkpoint")`
	`453`	`+ image, err := ioutil.TempDir(os.Getenv("XDG_RUNTIME_DIR"), "ctd-checkpoint")`
`454`	`454`	`if err != nil {`
`455`	`455`	`return nil, errdefs.ToGRPC(err)`
`456`	`456`	`}`