Merge branch '19099-singularity-container-shell'

closes #19099

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc lib/crunchrun/crunchrun.go
Simple merge

diff --cc lib/crunchrun/crunchrun_test.go
Simple merge

diff --cc lib/crunchrun/docker.go
Simple merge

diff --cc lib/crunchrun/executor.go
index 0a65f4d63466e840c8e2ff39dfa9614cf01fafce,b5b7884339152acab09778c689863afd2c062941..1ed460acd966c3a64d32e11d749a6ac04e8260f1
--- 1/lib/crunchrun/executor.go
--- 2/lib/crunchrun/executor.go
+++ b/lib/crunchrun/executor.go
@@@ -60,6 -60,8 +60,8 @@@ type containerExecutor interface 
        // Release resources (temp dirs, stopped containers)
        Close()
  
 -      // Name of runtime engine ("docker", "singularity")
 +      // Name and version of runtime engine ("docker 20.10.16", "singularity-ce version 3.9.9")
        Runtime() string
+ 
+       GatewayTarget
  }

diff --cc lib/crunchrun/executor_test.go
Simple merge

diff --cc lib/crunchrun/singularity.go
index 1af0d420e4ca814c0da717b9f21ed1a432a59161,2d8962e96a39472e4fa8bb375c7decdec69e3576..1da401f859f94b36655f771e5fea5af750b0cbe7
--- 1/lib/crunchrun/singularity.go
--- 2/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@@ -5,12 -5,17 +5,18 @@@
  package crunchrun
  
  import (
+       "bytes"
+       "errors"
        "fmt"
        "io/ioutil"
+       "net"
        "os"
        "os/exec"
+       "os/user"
+       "regexp"
        "sort"
+       "strconv"
 +      "strings"
        "syscall"
        "time"
  

diff --cc lib/crunchrun/singularity_test.go
index bad2abef33efc25ec6e04833d58b22029694e720,7e5819bb482abe53a81ca827402a0f15bfdfe173..e4c7cdb308ede92a3456fc253444b1f61aed79ad
--- 1/lib/crunchrun/singularity_test.go
--- 2/lib/crunchrun/singularity_test.go
+++ b/lib/crunchrun/singularity_test.go
@@@ -47,6 -77,6 +77,6 @@@ func (s *singularityStubSuite) TestSing
        c.Check(err, IsNil)
        e.imageFilename = "/fake/image.sif"
        cmd := e.execCmd("./singularity")
-       c.Check(cmd.Args, DeepEquals, []string{"./singularity", "exec", "--containall", "--cleanenv", "--pwd", "/WorkingDir", "--net", "--network=none", "--nv", "--bind", "/hostpath:/mnt:ro", "/fake/image.sif"})
+       c.Check(cmd.Args, DeepEquals, []string{"./singularity", "exec", "--containall", "--cleanenv", "--pwd=/WorkingDir", "--net", "--network=none", "--nv", "--bind", "/hostpath:/mnt:ro", "/fake/image.sif"})
 -      c.Check(cmd.Env, DeepEquals, []string{"SINGULARITYENV_FOO=bar"})
 +      c.Check(cmd.Env, DeepEquals, []string{"SINGULARITYENV_FOO=bar", "SINGULARITY_NO_EVAL=1"})
  }

diff --cc lib/install/deps.go
Simple merge