[ARVADOS] updated: 786a15e90e467cd7f9dc9be6f70d7ec0c4d8e111

[Git user]

Summary of changes:
 tools/arvbox/bin/arvbox                       | 5 ++++-
 tools/arvbox/lib/arvbox/docker/common.sh      | 2 ++
 tools/arvbox/lib/arvbox/docker/createusers.sh | 5 +++--
 3 files changed, 9 insertions(+), 3 deletions(-)

       via  786a15e90e467cd7f9dc9be6f70d7ec0c4d8e111 (commit)
      from  8078724be30f3df89eca3252921a2d1b8d14bea3 (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 786a15e90e467cd7f9dc9be6f70d7ec0c4d8e111
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Sep 14 20:22:49 2017 -0400

    Arvbox support for caching and offline install of npm packages.  no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index 89925ba..6d535ea 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -51,6 +51,7 @@ VAR_DATA="$ARVBOX_DATA/var"
 PASSENGER="$ARVBOX_DATA/passenger"
 GEMS="$ARVBOX_DATA/gems"
 PIPCACHE="$ARVBOX_DATA/pip"
+NPMCACHE="$ARVBOX_DATA/npm"
 GOSTUFF="$ARVBOX_DATA/gopath"
 
 getip() {
@@ -183,7 +184,7 @@ run() {
         updateconf
         wait_for_arvbox
     else
-        mkdir -p "$PG_DATA" "$VAR_DATA" "$PASSENGER" "$GEMS" "$PIPCACHE" "$GOSTUFF"
+        mkdir -p "$PG_DATA" "$VAR_DATA" "$PASSENGER" "$GEMS" "$PIPCACHE" "$NPMCACHE" "$GOSTUFF"
 
 
         if ! test -d "$ARVADOS_ROOT" ; then
@@ -209,6 +210,7 @@ run() {
                        "--volume=$PASSENGER:/var/lib/passenger:rw" \
                        "--volume=$GEMS:/var/lib/gems:rw" \
                        "--volume=$PIPCACHE:/var/lib/pip:rw" \
+                       "--volume=$NPMCACHE:/var/lib/npm:rw" \
                        "--volume=$GOSTUFF:/var/lib/gopath:rw" \
                        arvados/arvbox-dev$TAG \
                        /usr/local/bin/runsvinit -svdir=/etc/test-service
@@ -249,6 +251,7 @@ run() {
                    "--volume=$PASSENGER:/var/lib/passenger:rw" \
                    "--volume=$GEMS:/var/lib/gems:rw" \
                    "--volume=$PIPCACHE:/var/lib/pip:rw" \
+                   "--volume=$NPMCACHE:/var/lib/npm:rw" \
                    "--volume=$GOSTUFF:/var/lib/gopath:rw" \
                    $PUBLIC \
                    arvados/arvbox-dev$TAG
diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index 8792d31..9bf92f4 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -6,6 +6,8 @@
 export PATH=${PATH}:/usr/local/go/bin:/var/lib/gems/bin
 export GEM_HOME=/var/lib/gems
 export GEM_PATH=/var/lib/gems
+export npm_config_cache=/var/lib/npm
+export npm_config_cache_min=Infinity
 
 if test -s /var/run/localip_override ; then
     localip=$(cat /var/run/localip_override)
diff --git a/tools/arvbox/lib/arvbox/docker/createusers.sh b/tools/arvbox/lib/arvbox/docker/createusers.sh
index f717ea9..3296a3c 100755
--- a/tools/arvbox/lib/arvbox/docker/createusers.sh
+++ b/tools/arvbox/lib/arvbox/docker/createusers.sh
@@ -10,7 +10,8 @@ if ! grep "^arvbox:" /etc/passwd >/dev/null 2>/dev/null ; then
     HOSTGID=$(ls -nd /usr/src/arvados | sed 's/ */ /' | cut -d' ' -f5)
 
     mkdir -p /var/lib/arvados/git /var/lib/gems \
-          /var/lib/passenger /var/lib/gopath /var/lib/pip
+          /var/lib/passenger /var/lib/gopath \
+          /var/lib/pip /var/lib/npm
 
     groupadd --gid $HOSTGID --non-unique arvbox
     groupadd --gid $HOSTGID --non-unique git
@@ -25,7 +26,7 @@ if ! grep "^arvbox:" /etc/passwd >/dev/null 2>/dev/null ; then
     chown arvbox:arvbox -R /usr/local /var/lib/arvados /var/lib/gems \
           /var/lib/passenger /var/lib/postgresql \
           /var/lib/nginx /var/log/nginx /etc/ssl/private \
-          /var/lib/gopath /var/lib/pip
+          /var/lib/gopath /var/lib/pip /var/lib/npm
 
     mkdir -p /var/lib/gems/ruby
     chown arvbox:arvbox -R /var/lib/gems/ruby

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


hooks/post-receive
--