From: Peter Amstutz Date: Sun, 8 Dec 2019 21:33:51 +0000 (-0500) Subject: arvbox uses "go install" instead of "go get" no issue # X-Git-Tag: 2.0.0~89 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/69c206fb1c2fd54c7f8b2be008c587cb5e4a638e?ds=sidebyside arvbox uses "go install" instead of "go get" no issue # Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox index 246229decf..12a7f4caf1 100755 --- a/tools/arvbox/bin/arvbox +++ b/tools/arvbox/bin/arvbox @@ -193,6 +193,7 @@ run() { defaultdev=$(/sbin/ip route|awk '/default/ { print $5 }') localip=$(ip addr show $defaultdev | grep 'inet ' | sed 's/ *inet \(.*\)\/.*/\1/') fi + echo "Public arvbox will use address $localip" iptemp=$(tempfile) echo $localip > $iptemp chmod og+r $iptemp diff --git a/tools/arvbox/lib/arvbox/docker/go-setup.sh b/tools/arvbox/lib/arvbox/docker/go-setup.sh index e09cf7ae61..c62000f4c5 100644 --- a/tools/arvbox/lib/arvbox/docker/go-setup.sh +++ b/tools/arvbox/lib/arvbox/docker/go-setup.sh @@ -9,9 +9,9 @@ mkdir -p $GOPATH 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 get git.curoverse.com/arvados.git/cmd/arvados-server + /usr/local/lib/arvbox/runsu.sh flock /var/lib/gopath/gopath.lock go install git.curoverse.com/arvados.git/cmd/arvados-server else flock /var/lib/gopath/gopath.lock go mod download - flock /var/lib/gopath/gopath.lock go get git.curoverse.com/arvados.git/cmd/arvados-server + flock /var/lib/gopath/gopath.lock go install git.curoverse.com/arvados.git/cmd/arvados-server fi install $GOPATH/bin/arvados-server /usr/local/bin diff --git a/tools/arvbox/lib/arvbox/docker/keep-setup.sh b/tools/arvbox/lib/arvbox/docker/keep-setup.sh index 0c4daec1bf..ab9b76011f 100755 --- a/tools/arvbox/lib/arvbox/docker/keep-setup.sh +++ b/tools/arvbox/lib/arvbox/docker/keep-setup.sh @@ -10,7 +10,7 @@ set -eux -o pipefail . /usr/local/lib/arvbox/common.sh . /usr/local/lib/arvbox/go-setup.sh -flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/keepstore" +flock /var/lib/gopath/gopath.lock go install "git.curoverse.com/arvados.git/services/keepstore" install $GOPATH/bin/keepstore /usr/local/bin if test "$1" = "--only-deps" ; then diff --git a/tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service b/tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service index 38522a714c..dc08454bca 100755 --- a/tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service +++ b/tools/arvbox/lib/arvbox/docker/service/arv-git-httpd/run-service @@ -9,7 +9,7 @@ set -ex -o pipefail . /usr/local/lib/arvbox/common.sh . /usr/local/lib/arvbox/go-setup.sh -flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/arv-git-httpd" +flock /var/lib/gopath/gopath.lock go install "git.curoverse.com/arvados.git/services/arv-git-httpd" install $GOPATH/bin/arv-git-httpd /usr/local/bin if test "$1" = "--only-deps" ; then diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service index 4330157937..1d87c6a709 100755 --- a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service +++ b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch-local/run-service @@ -9,8 +9,8 @@ set -ex -o pipefail . /usr/local/lib/arvbox/common.sh . /usr/local/lib/arvbox/go-setup.sh -flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/crunch-run" -flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/crunch-dispatch-local" +flock /var/lib/gopath/gopath.lock go install "git.curoverse.com/arvados.git/services/crunch-run" +flock /var/lib/gopath/gopath.lock go install "git.curoverse.com/arvados.git/services/crunch-dispatch-local" install $GOPATH/bin/crunch-run $GOPATH/bin/crunch-dispatch-local /usr/local/bin if test "$1" = "--only-deps" ; then diff --git a/tools/arvbox/lib/arvbox/docker/service/keep-web/run-service b/tools/arvbox/lib/arvbox/docker/service/keep-web/run-service index a38b633a8b..866a9c9b20 100755 --- a/tools/arvbox/lib/arvbox/docker/service/keep-web/run-service +++ b/tools/arvbox/lib/arvbox/docker/service/keep-web/run-service @@ -9,7 +9,7 @@ set -ex -o pipefail . /usr/local/lib/arvbox/common.sh . /usr/local/lib/arvbox/go-setup.sh -flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/keep-web" +flock /var/lib/gopath/gopath.lock go install "git.curoverse.com/arvados.git/services/keep-web" install $GOPATH/bin/keep-web /usr/local/bin if test "$1" = "--only-deps" ; then diff --git a/tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service b/tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service index 96457a6e59..8b4a108d06 100755 --- a/tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service +++ b/tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service @@ -10,7 +10,7 @@ set -ex -o pipefail . /usr/local/lib/arvbox/common.sh . /usr/local/lib/arvbox/go-setup.sh -flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/keepproxy" +flock /var/lib/gopath/gopath.lock go install "git.curoverse.com/arvados.git/services/keepproxy" install $GOPATH/bin/keepproxy /usr/local/bin if test "$1" = "--only-deps" ; then diff --git a/tools/arvbox/lib/arvbox/docker/service/websockets/run-service b/tools/arvbox/lib/arvbox/docker/service/websockets/run-service index cc33032474..51df6ee313 100755 --- a/tools/arvbox/lib/arvbox/docker/service/websockets/run-service +++ b/tools/arvbox/lib/arvbox/docker/service/websockets/run-service @@ -16,7 +16,7 @@ fi . /usr/local/lib/arvbox/go-setup.sh -flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/ws" +flock /var/lib/gopath/gopath.lock go install "git.curoverse.com/arvados.git/services/ws" install $GOPATH/bin/ws /usr/local/bin/arvados-ws if test "$1" = "--only-deps" ; then