projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19094: Note docker/singularity/arv-mount versions in container log.
[arvados.git]
/
lib
/
crunchrun
/
singularity.go
diff --git
a/lib/crunchrun/singularity.go
b/lib/crunchrun/singularity.go
index 64a3773250701ecd62832e52e88a5fcf8a2b3da2..879c46c8989612913b3474ebddcb88b9be5bb122 100644
(file)
--- a/
lib/crunchrun/singularity.go
+++ b/
lib/crunchrun/singularity.go
@@
-10,6
+10,7
@@
import (
"os"
"os/exec"
"sort"
"os"
"os/exec"
"sort"
+ "strings"
"syscall"
"time"
"syscall"
"time"
@@
-36,7
+37,13
@@
func newSingularityExecutor(logf func(string, ...interface{})) (*singularityExec
}, nil
}
}, nil
}
-func (e *singularityExecutor) Runtime() string { return "singularity" }
+func (e *singularityExecutor) Runtime() string {
+ buf, err := exec.Command("singularity", "--version").CombinedOutput()
+ if err != nil {
+ return "singularity (unknown version)"
+ }
+ return strings.TrimSuffix(string(buf), "\n")
+}
func (e *singularityExecutor) getOrCreateProject(ownerUuid string, name string, containerClient *arvados.Client) (*arvados.Group, error) {
var gp arvados.GroupList
func (e *singularityExecutor) getOrCreateProject(ownerUuid string, name string, containerClient *arvados.Client) (*arvados.Group, error) {
var gp arvados.GroupList