projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16267: Merge branch 'master' into 16267-change-arvbox-deps
[arvados.git]
/
tools
/
arvbox
/
lib
/
arvbox
/
docker
/
go-setup.sh
diff --git
a/tools/arvbox/lib/arvbox/docker/go-setup.sh
b/tools/arvbox/lib/arvbox/docker/go-setup.sh
index 9bee9104482525c5f2f7856dd9c39735915ab5d4..21be0ccd6fc93649e587596913f2bf35388d508a 100644
(file)
--- a/
tools/arvbox/lib/arvbox/docker/go-setup.sh
+++ b/
tools/arvbox/lib/arvbox/docker/go-setup.sh
@@
-8,10
+8,14
@@
mkdir -p $GOPATH
cd /usr/src/arvados
if [[ $UID = 0 ]] ; then
cd /usr/src/arvados
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 mod download
+ if [[ ! -f /usr/local/bin/arvados-server ]]; then
/usr/local/lib/arvbox/runsu.sh flock /var/lib/gopath/gopath.lock go install git.arvados.org/arvados.git/cmd/arvados-server
/usr/local/lib/arvbox/runsu.sh flock /var/lib/gopath/gopath.lock go install git.arvados.org/arvados.git/cmd/arvados-server
+ fi
else
else
- flock /var/lib/gopath/gopath.lock go mod download
+ flock /var/lib/gopath/gopath.lock go mod download
+ if [[ ! -f /usr/local/bin/arvados-server ]]; then
flock /var/lib/gopath/gopath.lock go install git.arvados.org/arvados.git/cmd/arvados-server
flock /var/lib/gopath/gopath.lock go install git.arvados.org/arvados.git/cmd/arvados-server
+ fi
fi
install $GOPATH/bin/arvados-server /usr/local/bin
fi
install $GOPATH/bin/arvados-server /usr/local/bin