Merge 4f9a9ba2d8 into ee1702b176

contrib/analyze-local-images/README.md

@@ -26,6 +26,6 @@ Or, If you run Clair remotely (ie. boot2docker),
 analyze-local-images -endpoint "http://<CLAIR-IP-ADDRESS>:6060" -my-address "<MY-IP-ADDRESS>" <Docker Image ID>
 ```
 
-Clair needs access to the image files. If you run Clair locally, this tool will store the files in the system's temporary folder and Clair will find them there. It means if Clair is running in Docker, the host's temporary folder must be mounted in the Clair's container. If you run Clair remotely, this tool will run a small HTTP server to let Clair downloading them. It listens on the port 9279 and allows a single host: Clair's IP address, extracted from the `-endpoint` parameter. The `my-address` parameters defines the IP address of the HTTP server that Clair will use to download the images. With boot2docker, these parameters would be `-endpoint "http://192.168.99.100:6060" -my-address "192.168.99.1"`.
+Clair needs access to the image files. If you run Clair locally, this tool will store the files in the system's temporary folder and Clair will find them there. It means if Clair is running in Docker, the host's temporary folder must be mounted in the Clair's container. You can specify your temporary folder using the `-tempdir` parameter. If you run Clair remotely, this tool will run a small HTTP server to let Clair downloading them. It listens on the port 9279 and allows a single host: Clair's IP address, extracted from the `-endpoint` parameter. The `my-address` parameters defines the IP address of the HTTP server that Clair will use to download the images. With boot2docker, these parameters would be `-endpoint "http://192.168.99.100:6060" -my-address "192.168.99.1"`.
 
 As it runs an HTTP server and not an HTTP**S** one, be sure to **not** expose sensitive data and container images.

contrib/analyze-local-images/main.go

@@ -50,6 +50,7 @@ var (
 	flagMyAddress       = flag.String("my-address", "127.0.0.1", "Address from the point of view of Clair")
 	flagMinimumSeverity = flag.String("minimum-severity", "Negligible", "Minimum severity of vulnerabilities to show (Unknown, Negligible, Low, Medium, High, Critical, Defcon1)")
 	flagColorMode       = flag.String("color", "auto", "Colorize the output (always, auto, never)")
+	flagTempDir         = flag.String("tempdir", "/tmp", "Temporary folder")
 )
 
 type vulnerabilityInfo struct {
@@ -116,7 +117,7 @@ func intMain() int {
 	}
 
 	// Create a temporary folder.
-	tmpPath, err := ioutil.TempDir("", "analyze-local-image-")
+	tmpPath, err := ioutil.TempDir(*flagTempDir, "analyze-local-image-")
 	if err != nil {
 		log.Fatalf("Could not create temporary folder: %s", err)
 	}