[ARVADOS] updated: 2.1.0-1064-g9a1c67dea

[Git user]

Summary of changes:
 lib/crunchrun/singularity.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

       via  9a1c67deabd249e068284bb86f148d4aa9998711 (commit)
      from  696f75b0c857a01b31205411cdef7a20fe7b93fe (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 9a1c67deabd249e068284bb86f148d4aa9998711
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Jul 16 11:00:57 2021 -0400

    17816: Sort bind mounts on singularity command line
    
    Need to mount parent directories before we can mount things inside
    them.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go
index 2a294cf03..bcaff3bcc 100644
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"sort"
 	"syscall"
 
 	"golang.org/x/net/context"
@@ -82,7 +83,13 @@ func (e *singularityExecutor) Start() error {
 		false: "rw",
 		true:  "ro",
 	}
-	for path, mount := range e.spec.BindMounts {
+	var binds []string
+	for path, _ := range e.spec.BindMounts {
+		binds = append(binds, path)
+	}
+	sort.Strings(binds)
+	for _, path := range binds {
+		mount := e.spec.BindMounts[path]
 		args = append(args, "--bind", mount.HostPath+":"+path+":"+readonlyflag[mount.ReadOnly])
 	}
 	args = append(args, e.imageFilename)

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


hooks/post-receive
--