X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fbffa8c4d0fa8bd19fe77b82c16395b80f0bb0ce..2582dc22a24ee7cdaf1a68c6b4b1c639f88c2efe:/lib/crunchrun/singularity.go?ds=sidebyside

diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go
index a768dbfa2c..5af023a83d 100644
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@ -160,7 +160,22 @@ func (e *singularityExecutor) LoadImage(dockerImageID string, imageTarballPath s
 			return err
 		}
 
+		// Set up a cache and tmp dir for singularity build
+		err = os.Mkdir(e.tmpdir+"/cache", 0700)
+		if err != nil {
+			return err
+		}
+		defer os.RemoveAll(e.tmpdir + "/cache")
+		err = os.Mkdir(e.tmpdir+"/tmp", 0700)
+		if err != nil {
+			return err
+		}
+		defer os.RemoveAll(e.tmpdir + "/tmp")
+
 		build := exec.Command("singularity", "build", imageFilename, "docker-archive://"+e.tmpdir+"/image.tar")
+		build.Env = os.Environ()
+		build.Env = append(build.Env, "SINGULARITY_CACHEDIR="+e.tmpdir+"/cache")
+		build.Env = append(build.Env, "SINGULARITY_TMPDIR="+e.tmpdir+"/tmp")
 		e.logf("%v", build.Args)
 		out, err := build.CombinedOutput()
 		// INFO:    Starting build...
@@ -227,7 +242,7 @@ func (e *singularityExecutor) Create(spec containerSpec) error {
 }
 
 func (e *singularityExecutor) Start() error {
-	args := []string{"singularity", "exec", "--containall", "--no-home", "--cleanenv", "--pwd", e.spec.WorkingDir}
+	args := []string{"singularity", "exec", "--containall", "--cleanenv", "--pwd", e.spec.WorkingDir}
 	if !e.spec.EnableNetwork {
 		args = append(args, "--net", "--network=none")
 	}
@@ -242,7 +257,12 @@ func (e *singularityExecutor) Start() error {
 	sort.Strings(binds)
 	for _, path := range binds {
 		mount := e.spec.BindMounts[path]
-		args = append(args, "--bind", mount.HostPath+":"+path+":"+readonlyflag[mount.ReadOnly])
+		if path == e.spec.Env["HOME"] {
+			// Singularity treates $HOME as special case
+			args = append(args, "--home", mount.HostPath+":"+path)
+		} else {
+			args = append(args, "--bind", mount.HostPath+":"+path+":"+readonlyflag[mount.ReadOnly])
+		}
 	}
 
 	// This is for singularity 3.5.2. There are some behaviors
@@ -252,10 +272,9 @@ func (e *singularityExecutor) Start() error {
 	env := make([]string, 0, len(e.spec.Env))
 	for k, v := range e.spec.Env {
 		if k == "HOME" {
-			// $HOME is a special case on Singularity 3.5,
-			// but is just a normal variable on Singularity 3.6+
-			// I think this will work with both
-			args = append(args, "--home="+v)
+			// Singularity treates $HOME as special case, this is handled
+			// with --home above
+			continue
 		}
 		env = append(env, "SINGULARITYENV_"+k+"="+v)
 	}