From 6549d7f1234bb6c8cf3ae5032b8105a5e8229e7a Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Mon, 7 Feb 2022 11:28:48 -0500 Subject: [PATCH] 18657: Bind mount gems dir at new location Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- tools/arvbox/bin/arvbox | 1 + tools/arvbox/lib/arvbox/docker/service/ready/run-service | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox index dd53d89c0f..e7d03677ea 100755 --- a/tools/arvbox/bin/arvbox +++ b/tools/arvbox/bin/arvbox @@ -143,6 +143,7 @@ docker_run_dev() { "--volume=$PG_DATA:/var/lib/postgresql:rw" \ "--volume=$VAR_DATA:$ARVADOS_CONTAINER_PATH:rw" \ "--volume=$PASSENGER:/var/lib/passenger:rw" \ + "--volume=$GEMS:/var/lib/arvados/lib/ruby/gems:rw" \ "--volume=$PIPCACHE:/var/lib/pip:rw" \ "--volume=$NPMCACHE:/var/lib/npm:rw" \ "--volume=$GOSTUFF:/var/lib/gopath:rw" \ diff --git a/tools/arvbox/lib/arvbox/docker/service/ready/run-service b/tools/arvbox/lib/arvbox/docker/service/ready/run-service index 6aab295005..6ec788589f 100755 --- a/tools/arvbox/lib/arvbox/docker/service/ready/run-service +++ b/tools/arvbox/lib/arvbox/docker/service/ready/run-service @@ -63,7 +63,7 @@ fi if ! [[ -z "$waiting" ]] ; then if ps x | grep -v grep | grep "bundle install" > /dev/null; then - gemcount=0 # $(ls $GEM_HOME/gems 2>/dev/null | wc -l) + gemcount=$(ls /var/lib/arvados/lib/ruby/gems/*/gems 2>/dev/null | wc -l) gemlockcount=0 for l in /usr/src/arvados/services/api/Gemfile.lock \ -- 2.30.2