[ARVADOS] updated: 2.1.0-1837-g6bee9f6a6

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/common.sh               | 2 +-
 tools/arvbox/lib/arvbox/docker/createusers.sh          | 2 +-
 tools/arvbox/lib/arvbox/docker/service/sdk/run-service | 1 -
 tools/arvbox/lib/arvbox/docker/service/vm/run          | 2 +-
 tools/arvbox/lib/arvbox/docker/service/vm/run-service  | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

       via  6bee9f6a6be594a7bcda9ec4062d56e325b2efc6 (commit)
      from  6549d7f1234bb6c8cf3ae5032b8105a5e8229e7a (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 6bee9f6a6be594a7bcda9ec4062d56e325b2efc6
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Feb 7 12:02:29 2022 -0500

    18657: Can't symlink to binstubs, need to invoke them in place
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index 3ad82b3f8..f391376f3 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -6,7 +6,7 @@ export RUBY_VERSION=2.7.0
 export BUNDLER_VERSION=2.2.19
 
 export DEBIAN_FRONTEND=noninteractive
-export PATH=${PATH}:/usr/local/go/bin:/var/lib/arvados/bin
+export PATH=${PATH}:/usr/local/go/bin:/var/lib/arvados/bin:/usr/src/arvados/sdk/cli/binstubs
 export npm_config_cache=/var/lib/npm
 export npm_config_cache_min=Infinity
 export R_LIBS=/var/lib/Rlibs
diff --git a/tools/arvbox/lib/arvbox/docker/createusers.sh b/tools/arvbox/lib/arvbox/docker/createusers.sh
index f5cbc72e0..9c81a66ce 100755
--- a/tools/arvbox/lib/arvbox/docker/createusers.sh
+++ b/tools/arvbox/lib/arvbox/docker/createusers.sh
@@ -51,7 +51,7 @@ if ! grep "^arvbox:" /etc/passwd >/dev/null 2>/dev/null ; then
     echo "arvbox    ALL=(crunch) NOPASSWD: ALL" >> /etc/sudoers
 
     cat <<EOF > /etc/profile.d/paths.sh
-export PATH=/var/lib/arvados/bin:/usr/local/bin:/usr/bin:/bin
+export PATH=/var/lib/arvados/bin:/usr/local/bin:/usr/bin:/bin:/usr/src/arvados/sdk/cli/binstubs
 export npm_config_cache=/var/lib/npm
 export npm_config_cache_min=Infinity
 export R_LIBS=/var/lib/Rlibs
diff --git a/tools/arvbox/lib/arvbox/docker/service/sdk/run-service b/tools/arvbox/lib/arvbox/docker/service/sdk/run-service
index c5bf852ab..62eb50c7a 100755
--- a/tools/arvbox/lib/arvbox/docker/service/sdk/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/sdk/run-service
@@ -16,7 +16,6 @@ EOF
 
 cd /usr/src/arvados/sdk/cli
 run_bundler --binstubs=binstubs
-ln -sf /usr/src/arvados/sdk/cli/binstubs/arv /usr/local/bin/arv
 
 export PYCMD=python3
 
diff --git a/tools/arvbox/lib/arvbox/docker/service/vm/run b/tools/arvbox/lib/arvbox/docker/service/vm/run
index 4ea11aadc..61430d02b 100755
--- a/tools/arvbox/lib/arvbox/docker/service/vm/run
+++ b/tools/arvbox/lib/arvbox/docker/service/vm/run
@@ -20,6 +20,6 @@ export ARVADOS_API_TOKEN=$(cat $ARVADOS_CONTAINER_PATH/superuser_token)
 export ARVADOS_VIRTUAL_MACHINE_UUID=$(cat $ARVADOS_CONTAINER_PATH/vm-uuid)
 
 while true ; do
-      arvados-login-sync
+      /usr/src/arvados/services/login-sync/binstubs/arvados-login-sync
       sleep 120
 done
diff --git a/tools/arvbox/lib/arvbox/docker/service/vm/run-service b/tools/arvbox/lib/arvbox/docker/service/vm/run-service
index 0c7213f86..eddef764c 100755
--- a/tools/arvbox/lib/arvbox/docker/service/vm/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/vm/run-service
@@ -17,7 +17,6 @@ fi
 
 cd /usr/src/arvados/services/login-sync
 run_bundler --binstubs=$PWD/binstubs
-ln -sf /usr/src/arvados/services/login-sync/binstubs/arvados-login-sync /usr/local/bin/arvados-login-sync
 
 if test "$1" = "--only-deps" ; then
     exit

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


hooks/post-receive
--