[ARVADOS] updated: 2.1.0-1482-gd8ecd9d89

[Git user]

Summary of changes:
 lib/crunchrun/singularity.go | 7 +++++++
 1 file changed, 7 insertions(+)

       via  d8ecd9d8940a50ebabe089eb326753f54bb2831b (commit)
      from  a85399e0a429791d8cc508984b024bba03fdf3f5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d8ecd9d8940a50ebabe089eb326753f54bb2831b
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Oct 8 10:43:52 2021 -0400

    18258: also handle SINGULARITY_TMPDIR
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go
index 681dbb6cc..5af023a83 100644
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@ -160,15 +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...

-----------------------------------------------------------------------


hooks/post-receive
--