Use single temp directory base

README.md

@@ -23,7 +23,7 @@ Note that adding a user to group *docker* has serious security implications. Che
 
 ### macOS
 
-    $ brew cask install docker
+    $ brew install --cask docker
     $ open --background -a Docker && sleep 1m
     $ brew tap out-of-tree/repo
     $ brew install out-of-tree

debug.go

@@ -144,7 +144,7 @@ func (cmd *DebugCmd) Run(g *Globals) (err error) {
 	}
 	defer q.Stop()
 
-	tmp, err := ioutil.TempDir("/tmp/", "out-of-tree_")
+	tmp, err := ioutil.TempDir(tempDirBase, "out-of-tree_")
 	if err != nil {
 		return
 	}

images.go

@@ -159,7 +159,7 @@ func unpackTar(archive, destination string) (err error) {
 }
 
 func downloadImage(path, file string) (err error) {
-	tmp, err := ioutil.TempDir("/tmp/", "out-of-tree_")
+	tmp, err := ioutil.TempDir(tempDirBase, "out-of-tree_")
 	if err != nil {
 		return
 	}

kernel.go

@@ -172,7 +172,7 @@ func matchDebImagePkg(container, mask string) (pkgs []string, err error) {
 		return
 	}
 
-	output, err := c.Run("/tmp", cmd)
+	output, err := c.Run(tempDirBase, cmd)
 	if err != nil {
 		return
 	}
@@ -203,7 +203,7 @@ func matchCentOSDevelPkg(container, mask string, generic bool) (
 		return
 	}
 
-	output, err := c.Run("/tmp", cmd)
+	output, err := c.Run(tempDirBase, cmd)
 	if err != nil {
 		return
 	}
@@ -307,7 +307,8 @@ func generateBaseDockerImage(registry string, commands []config.DockerCommand,
 		d += "RUN apt-get install -y wget git\n"
 		// Install a single kernel and headers to ensure all dependencies are cached
 		d += "RUN export PKGNAME=$(apt-cache search --names-only '^linux-headers-[0-9\\.\\-]*-generic' | awk '{ print $1 }' | head -n 1); " +
-			"apt-get install -y $PKGNAME $(echo $PKGNAME | sed 's/headers/image/')\n"
+			"apt-get install -y $PKGNAME $(echo $PKGNAME | sed 's/headers/image/'); " +
+			"apt-get remove -y $PKGNAME $(echo $PKGNAME | sed 's/headers/image/')\n"
 		if sk.DistroRelease >= "14.04" {
 			d += "RUN apt-get install -y libseccomp-dev\n"
 		}
@@ -388,7 +389,7 @@ func generateBaseDockerImage(registry string, commands []config.DockerCommand,
 }
 
 func installKernel(sk config.KernelMask, pkgname string, force, headers bool) (err error) {
-	tmpdir, err := os.MkdirTemp("", "out-of-tree-"+pkgname+"-")
+	tmpdir, err := os.MkdirTemp(tempDirBase, "out-of-tree-"+pkgname+"-")
 	if err != nil {
 		log.Fatal().Err(err).Msg("make tmp directory")
 	}
@@ -444,7 +445,7 @@ func installKernel(sk config.KernelMask, pkgname string, force, headers bool) (e
 
 		cmd := fmt.Sprintf("apt-get install -y %s %s", pkgname, headerspkg)
 
-		_, err = c.Run("/tmp", cmd)
+		_, err = c.Run(tempDirBase, cmd)
 		if err != nil {
 			return
 		}
@@ -458,14 +459,14 @@ func installKernel(sk config.KernelMask, pkgname string, force, headers bool) (e
 		}
 		cmd := fmt.Sprintf("yum -y install %s %s\n", imagepkg,
 			pkgname)
-		_, err = c.Run("/tmp", cmd)
+		_, err = c.Run(tempDirBase, cmd)
 		if err != nil {
 			return
 		}
 
 		cmd = fmt.Sprintf("dracut --add-drivers 'e1000 ext4' -f "+
 			"/boot/initramfs-%s.img %s\n", version, version)
-		_, err = c.Run("/tmp", cmd)
+		_, err = c.Run(tempDirBase, cmd)
 		if err != nil {
 			return
 		}
@@ -504,7 +505,7 @@ func installKernel(sk config.KernelMask, pkgname string, force, headers bool) (e
 		cmd += " && cp -r /usr/src/* /target/usr/src/"
 	}
 
-	_, err = c.Run("/tmp", cmd)
+	_, err = c.Run(tempDirBase, cmd)
 	if err != nil {
 		return
 	}
@@ -675,7 +676,7 @@ func listContainersKernels(dii containerImageInfo, newkcfg *config.KernelConfig,
 	for _, cmd := range []string{
 		"find /boot -type f -exec chmod a+r {} \\;",
 	} {
-		_, err = c.Run("/tmp", cmd)
+		_, err = c.Run(tempDirBase, cmd)
 		if err != nil {
 			return
 		}
@@ -753,7 +754,9 @@ func generateKernels(km config.KernelMask, registry string,
 				max--
 				break
 			} else if attempt >= retries {
-				log.Fatal().Err(err).Msg("install kernel")
+				log.Error().Err(err).Msg("install kernel")
+				log.Debug().Msg("skip")
+				break
 			} else {
 				log.Warn().Err(err).Msg("install kernel")
 				time.Sleep(time.Second)

main.go

@@ -89,6 +89,8 @@ func (lw *LevelWriter) WriteLevel(l zerolog.Level, p []byte) (n int, err error)
 	return len(p), nil
 }
 
+var tempDirBase string
+
 func main() {
 	rand.Seed(time.Now().UnixNano())
 
@@ -101,7 +103,7 @@ func main() {
 			Compact: true,
 		}),
 		kong.Vars{
-			"version": "2.0.4",
+			"version": "2.0.6",
 		},
 	)
 
@@ -124,6 +126,9 @@ func main() {
 		return
 	}
 
+	tempDirBase = usr.HomeDir + "/.out-of-tree/tmp/"
+	os.MkdirAll(tempDirBase, os.ModePerm)
+
 	log.Logger = log.Output(zerolog.MultiLevelWriter(
 		&LevelWriter{Writer: zerolog.NewConsoleWriter(
 			func(w *zerolog.ConsoleWriter) {

pew.go

@@ -14,7 +14,6 @@ import (
 	"math/rand"
 	"os"
 	"os/exec"
-	"os/user"
 	"strings"
 	"time"
 
@@ -599,14 +598,7 @@ func (cmd PewCmd) testArtifact(swg *sizedwaitgroup.SizedWaitGroup,
 		}
 	}()
 
-	usr, err := user.Current()
+	tmp, err := ioutil.TempDir(tempDirBase, "out-of-tree_")
-	if err != nil {
-		return
-	}
-	tmpdir := usr.HomeDir + "/.out-of-tree/tmp"
-	os.MkdirAll(tmpdir, os.ModePerm)
-
-	tmp, err := ioutil.TempDir(tmpdir, "out-of-tree_")
 	if err != nil {
 		slog.Error().Err(err).Msg("making tmp directory")
 		return

preload.go

@@ -61,7 +61,7 @@ func preload(q *qemu.System, ki config.KernelInfo, pm config.PreloadModule,
 func buildAndInsmod(workPath string, q *qemu.System, ki config.KernelInfo,
 	dockerTimeout time.Duration, cache string) (err error) {
 
-	tmp, err := ioutil.TempDir("", "out-of-tree_")
+	tmp, err := ioutil.TempDir(tempDirBase, "out-of-tree_")
 	if err != nil {
 		return
 	}