18657: Still need to use bundle exec rake??? Fix binstubs/passenger

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/api-setup.sh b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index 9bc8ac076d89cf60bb777af7206f329bf52273f6..4af0cca0ed51ccade4f03353d3be450949029542 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/api-setup.sh
@@ -56,7 +56,7 @@ EOF
 fi
 
 if ! test -f $ARVADOS_CONTAINER_PATH/api_database_setup ; then
-   bin/rake db:setup
+   bin/bundle exec rake db:setup
    touch $ARVADOS_CONTAINER_PATH/api_database_setup
 fi
 
@@ -68,4 +68,4 @@ fi
 rm -rf tmp
 mkdir -p tmp/cache
 
-bin/rake db:migrate
+bin/bundle exec rake db:migrate

diff --git a/tools/arvbox/lib/arvbox/docker/service/api/run-service b/tools/arvbox/lib/arvbox/docker/service/api/run-service
index 9b6976d806915517704aa6dcf633dbf3f69efb2b..0f55a254085cbbef4ce3ba87da49b33ca043b21c 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/api/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/api/run-service
@@ -33,4 +33,4 @@ fi
 
 touch $ARVADOS_CONTAINER_PATH/api.ready
 
-exec bin/passenger start --port=${services[api]}
+exec binstubs/passenger start --port=${services[api]}

diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run b/tools/arvbox/lib/arvbox/docker/service/workbench/run
index a3f53e9bdf0708a99a640e668962e051de25b89a..1b0ca47a3602277936b561233c87eecb0c3bf933 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run
@@ -23,7 +23,7 @@ fi
 
 if test "$1" != "--only-deps" ; then
     openssl verify -CAfile $root_cert $server_cert
-    exec bin/passenger start --port=${services[workbench]} \
+    exec binstubs/passenger start --port=${services[workbench]} \
         --ssl --ssl-certificate=$ARVADOS_CONTAINER_PATH/server-cert-${localip}.pem \
         --ssl-certificate-key=$ARVADOS_CONTAINER_PATH/server-cert-${localip}.key \
          --user arvbox

diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
index ca72805cc94cef34a979a54167e4feaa831bd0e3..20ef9fcaf6397d0829d6a40d712879cc992c3946 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run-service
@@ -34,7 +34,7 @@ cat >config/application.yml <<EOF
 $RAILS_ENV:
   keep_web_url: https://example.com/c=%{uuid_or_pdh}
 EOF
-   RAILS_GROUPS=assets bin/rake npm:install
+   RAILS_GROUPS=assets bin/bundle exec rake npm:install
    rm config/application.yml
    exit
 fi
@@ -43,5 +43,5 @@ set -u
 
 secret_token=$(cat $ARVADOS_CONTAINER_PATH/workbench_secret_token)
 
-RAILS_GROUPS=assets bin/rake npm:install
-bin/rake assets:precompile
+RAILS_GROUPS=assets bin/bundle exec rake npm:install
+bin/bundle exec rake assets:precompile