[ARVADOS] updated: 1.3.0-1238-g73b441efb

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/api-setup.sh           | 1 +
 tools/arvbox/lib/arvbox/docker/go-setup.sh            | 3 +++
 tools/arvbox/lib/arvbox/docker/service/controller/run | 2 --
 3 files changed, 4 insertions(+), 2 deletions(-)

       via  73b441efbc65110e131213bef7061dbd4070bfd2 (commit)
      from  e95c41c6a9ee3d1c01c31fa35d08eeadd440c24f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 73b441efbc65110e131213bef7061dbd4070bfd2
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jul 1 17:50:31 2019 -0400

    Tweak arvbox build order, API server depends on arvados-server
    
    refs #14812
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/api-setup.sh b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index c81eb908b..a64f2f928 100755
--- a/tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/api-setup.sh
@@ -7,6 +7,7 @@ exec 2>&1
 set -ex -o pipefail
 
 . /usr/local/lib/arvbox/common.sh
+. /usr/local/lib/arvbox/go-setup.sh
 
 cd /usr/src/arvados/services/api
 
diff --git a/tools/arvbox/lib/arvbox/docker/go-setup.sh b/tools/arvbox/lib/arvbox/docker/go-setup.sh
index f068ce684..cdd7298da 100644
--- a/tools/arvbox/lib/arvbox/docker/go-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/go-setup.sh
@@ -14,3 +14,6 @@ flock /var/lib/gopath/gopath.lock go get -t github.com/kardianos/govendor
 cd "$GOPATH/src/git.curoverse.com/arvados.git"
 flock /var/lib/gopath/gopath.lock go get -v -d ...
 flock /var/lib/gopath/gopath.lock "$GOPATH/bin/govendor" sync
+
+flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/cmd/arvados-server"
+install $GOPATH/bin/arvados-server /usr/local/bin
diff --git a/tools/arvbox/lib/arvbox/docker/service/controller/run b/tools/arvbox/lib/arvbox/docker/service/controller/run
index 986ad8496..799fc63e1 100755
--- a/tools/arvbox/lib/arvbox/docker/service/controller/run
+++ b/tools/arvbox/lib/arvbox/docker/service/controller/run
@@ -9,8 +9,6 @@ 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/cmd/arvados-server"
-install $GOPATH/bin/arvados-server /usr/local/bin
 (cd /usr/local/bin && ln -sf arvados-server arvados-controller)
 
 if test "$1" = "--only-deps" ; then

-----------------------------------------------------------------------


hooks/post-receive
--