[ARVADOS] updated: 2.1.0-1836-g6549d7f12

[Git user]

Summary of changes:
 tools/arvbox/bin/arvbox                                  | 1 +
 tools/arvbox/lib/arvbox/docker/service/ready/run-service | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

       via  6549d7f1234bb6c8cf3ae5032b8105a5e8229e7a (commit)
      from  8323dcbfe4833a0303286991dc64cdb0b0c0fa60 (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 6549d7f1234bb6c8cf3ae5032b8105a5e8229e7a
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Feb 7 11:28:48 2022 -0500

    18657: Bind mount gems dir at new location
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index dd53d89c0..e7d03677e 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 6aab29500..6ec788589 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 \

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


hooks/post-receive
--