[ARVADOS] updated: 2.1.0-1840-gf12012fc7

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/api-setup.sh                  | 4 ++--
 tools/arvbox/lib/arvbox/docker/service/api/run-service       | 2 +-
 tools/arvbox/lib/arvbox/docker/service/workbench/run         | 2 +-
 tools/arvbox/lib/arvbox/docker/service/workbench/run-service | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

       via  f12012fc721b4eeb5a72d3cee471cbd24264ec4d (commit)
      from  0f1064526171ef869ded3cb7b7f4bebdb6c084ba (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 f12012fc721b4eeb5a72d3cee471cbd24264ec4d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Feb 7 15:33:15 2022 -0500

    18657: Still need to use bundle exec rake???  Fix binstubs/passenger
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/api-setup.sh b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index 9bc8ac076..4af0cca0e 100755
--- 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 9b6976d80..0f55a2540 100755
--- 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 a3f53e9bd..1b0ca47a3 100755
--- 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 ca72805cc..20ef9fcaf 100755
--- 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

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


hooks/post-receive
--