From 0f1064526171ef869ded3cb7b7f4bebdb6c084ba Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curii.com>
Date: Mon, 7 Feb 2022 13:59:11 -0500
Subject: [PATCH] 18657: Don't install api & wb binstubs into bin/

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---
 build/run-tests.sh                                        | 8 ++++----
 tools/arvbox/lib/arvbox/docker/service/api/run-service    | 6 +++---
 tools/arvbox/lib/arvbox/docker/service/vm/run-service     | 2 +-
 .../lib/arvbox/docker/service/workbench/run-service       | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 5eb439441b..9a1fd3f113 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -962,11 +962,11 @@ install_services/api() {
         set -ex
         cd "$WORKSPACE/services/api"
         export RAILS_ENV=test
-        if "$bundle" exec rails db:environment:set ; then
-            "$bundle" exec rake db:drop
+        if bin/rails db:environment:set ; then
+            bin/rake db:drop
         fi
-        "$bundle" exec rake db:setup
-        "$bundle" exec rake db:fixtures:load
+        bin/rake db:setup
+        bin/rake db:fixtures:load
     ) || return 1
 }
 
diff --git a/tools/arvbox/lib/arvbox/docker/service/api/run-service b/tools/arvbox/lib/arvbox/docker/service/api/run-service
index 974ac98652..9b6976d806 100755
--- a/tools/arvbox/lib/arvbox/docker/service/api/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/api/run-service
@@ -16,9 +16,9 @@ else
   export RAILS_ENV=development
 fi
 
-run_bundler --without=development --binstubs
-bin/passenger-config build-native-support
-bin/passenger-config install-standalone-runtime
+run_bundler --without=development --binstubs=binstubs
+binstubs/passenger-config build-native-support
+binstubs/passenger-config install-standalone-runtime
 
 if test "$1" = "--only-deps" ; then
     exit
diff --git a/tools/arvbox/lib/arvbox/docker/service/vm/run-service b/tools/arvbox/lib/arvbox/docker/service/vm/run-service
index eddef764cb..2079bb1d0b 100755
--- a/tools/arvbox/lib/arvbox/docker/service/vm/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/vm/run-service
@@ -16,7 +16,7 @@ if test "$1" != "--only-deps" ; then
 fi
 
 cd /usr/src/arvados/services/login-sync
-run_bundler --binstubs=$PWD/binstubs
+run_bundler --binstubs=binstubs
 
 if test "$1" = "--only-deps" ; then
     exit
diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index 84d3017def..ca72805cc9 100755
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -22,9 +22,9 @@ else
   export RAILS_ENV=development
 fi
 
-run_bundler --without=development --binstubs
-bin/passenger-config build-native-support
-bin/passenger-config install-standalone-runtime
+run_bundler --without=development --binstubs=binstubs
+binstubs/passenger-config build-native-support
+binstubs/passenger-config install-standalone-runtime
 mkdir -p /usr/src/arvados/apps/workbench/tmp
 
 if test "$1" = "--only-deps" ; then
-- 
2.30.2