15107: arvbox uses "go mod download" instead of "go get ..."

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/go-setup.sh b/tools/arvbox/lib/arvbox/docker/go-setup.sh
index 20b2e30a02c95347c17d568198455b2dca48fb0a..15a11b05805b15a54edf37fedeeaa5a9c4b62d4d 100644 (file)
--- a/tools/arvbox/lib/arvbox/docker/go-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/go-setup.sh
@@ -7,6 +7,11 @@ export GOPATH=/var/lib/gopath
 mkdir -p $GOPATH
 
 cd /usr/src/arvados
-flock /var/lib/gopath/gopath.lock go get -v -d ...
-flock /var/lib/gopath/gopath.lock go get -t ./cmd/arvados-server
+if [[ $UID = 0 ]] ; then
+    /usr/local/lib/arvbox/runsu.sh flock /var/lib/gopath/gopath.lock go mod download
+    /usr/local/lib/arvbox/runsu.sh flock /var/lib/gopath/gopath.lock go get ./cmd/arvados-server
+else
+    flock /var/lib/gopath/gopath.lock go mod download
+    flock /var/lib/gopath/gopath.lock go get ./cmd/arvados-server
+fi
 install $GOPATH/bin/arvados-server /usr/local/bin