Remove tempdir handling from the nvidia package

plugin/src/nvidia-docker-plugin/main.go

@@ -4,6 +4,7 @@ package main
 
 import (
 	"flag"
+	"io/ioutil"
 	"log"
 	"os"
 
@@ -11,9 +12,9 @@ import (
 )
 
 var (
-	ListenAddr   string
-	VolumePrefix string
-	SocketPath   string
+	ListenAddr  string
+	VolumesPath string
+	SocketPath  string
 
 	Devices []nvidia.Device
 	Volumes nvidia.VolumeMap
@@ -23,7 +24,7 @@ func init() {
 	log.SetPrefix(os.Args[0] + " | ")
 
 	flag.StringVar(&ListenAddr, "l", "localhost:3476", "Server listen address")
-	flag.StringVar(&VolumePrefix, "p", "", "Volumes prefix path (default is to use mktemp)")
+	flag.StringVar(&VolumesPath, "v", "", "Path where to store the volumes (default is to use mktemp)")
 	flag.StringVar(&SocketPath, "s", "/run/docker/plugins/nvidia.sock", "NVIDIA plugin socket path")
 }
 
@@ -58,12 +59,13 @@ func main() {
 	Devices, err = nvidia.GetDevices()
 	assert(err)
 
-	if VolumePrefix == "" {
-		log.Println("Creating volumes")
-	} else {
-		log.Println("Creating volumes at", VolumePrefix)
+	if VolumesPath == "" {
+		VolumesPath, err = ioutil.TempDir("", "nvidia-volumes-")
+		assert(err)
+		defer func() { assert(os.RemoveAll(VolumesPath)) }()
 	}
-	Volumes, err = nvidia.GetVolumes(VolumePrefix)
+	log.Println("Creating volumes at", VolumesPath)
+	Volumes, err = nvidia.GetVolumes(VolumesPath)
 	assert(err)
 
 	plugin := NewPluginAPI(SocketPath)

plugin/src/nvidia/volumes.go

@@ -7,7 +7,6 @@ import (
 	"bytes"
 	"debug/elf"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -18,7 +17,6 @@ import (
 )
 
 const (
-	tempDir  = "nvidia-volumes-"
 	lib32Dir = "lib"
 	lib64Dir = "lib64"
 )
@@ -141,13 +139,6 @@ func which(bins ...string) ([]string, error) {
 }
 
 func GetVolumes(prefix string) (vols VolumeMap, err error) {
-	if prefix == "" {
-		prefix, err = ioutil.TempDir("", tempDir)
-		if err != nil {
-			return
-		}
-	}
-
 	cache, err := ldcache.Open()
 	if err != nil {
 		return nil, err