[ARVADOS] updated: 72b6a2992c69f557f3b6b850914c5ee914cf862b

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/api-setup.sh   |  3 ++-
 tools/arvbox/lib/arvbox/docker/createusers.sh | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

       via  72b6a2992c69f557f3b6b850914c5ee914cf862b (commit)
       via  38bf86b7d9e256aaae50870174ae2cf6a84e8656 (commit)
      from  c86cbaa6f286e50900dae3203a42044449e042f7 (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 72b6a2992c69f557f3b6b850914c5ee914cf862b
Merge: c86cbaa 38bf86b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 14 12:09:13 2017 -0500

    Merge branch 'fix-arvbox' no issue #


commit 38bf86b7d9e256aaae50870174ae2cf6a84e8656
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 14 11:05:56 2017 -0500

    Fix arvbox build.
    
    * Set up fuse groups separately.
    * Separate generating superuser token from writing file so as not to write file on failure.

diff --git a/tools/arvbox/lib/arvbox/docker/api-setup.sh b/tools/arvbox/lib/arvbox/docker/api-setup.sh
index d4ff7c9..c5eaf18 100755
--- a/tools/arvbox/lib/arvbox/docker/api-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/api-setup.sh
@@ -78,7 +78,8 @@ if ! test -f /var/lib/arvados/api_database_setup ; then
 fi
 
 if ! test -s /var/lib/arvados/superuser_token ; then
-    bundle exec ./script/create_superuser_token.rb > /var/lib/arvados/superuser_token
+    superuser_tok=$(bundle exec ./script/create_superuser_token.rb)
+    echo "$superuser_tok" > /var/lib/arvados/superuser_token
 fi
 
 rm -rf tmp
diff --git a/tools/arvbox/lib/arvbox/docker/createusers.sh b/tools/arvbox/lib/arvbox/docker/createusers.sh
index dbdf9d0..e9b965d 100755
--- a/tools/arvbox/lib/arvbox/docker/createusers.sh
+++ b/tools/arvbox/lib/arvbox/docker/createusers.sh
@@ -5,21 +5,19 @@ set -e -o pipefail
 if ! grep "^arvbox:" /etc/passwd >/dev/null 2>/dev/null ; then
     HOSTUID=$(ls -nd /usr/src/arvados | sed 's/ */ /' | cut -d' ' -f4)
     HOSTGID=$(ls -nd /usr/src/arvados | sed 's/ */ /' | cut -d' ' -f5)
-    FUSEGID=$(ls -nd /dev/fuse | sed 's/ */ /' | cut -d' ' -f5)
 
     mkdir -p /var/lib/arvados/git /var/lib/gems \
           /var/lib/passenger /var/lib/gopath /var/lib/pip
 
     groupadd --gid $HOSTGID --non-unique arvbox
-    groupadd --gid $FUSEGID --non-unique fuse
     groupadd --gid $HOSTGID --non-unique git
     useradd --home-dir /var/lib/arvados \
             --uid $HOSTUID --gid $HOSTGID \
             --non-unique \
-            --groups docker,fuse \
+            --groups docker \
             arvbox
     useradd --home-dir /var/lib/arvados/git --uid $HOSTUID --gid $HOSTGID --non-unique git
-    useradd --groups docker,fuse crunch
+    useradd --groups docker crunch
 
     chown arvbox:arvbox -R /usr/local /var/lib/arvados /var/lib/gems \
           /var/lib/passenger /var/lib/postgresql \
@@ -34,3 +32,12 @@ if ! grep "^arvbox:" /etc/passwd >/dev/null 2>/dev/null ; then
 
     echo "arvbox    ALL=(crunch) NOPASSWD: ALL" >> /etc/sudoers
 fi
+
+if ! grep "^fuse:" /etc/group >/dev/null 2>/dev/null ; then
+    if test -c /dev/fuse ; then
+        FUSEGID=$(ls -nd /dev/fuse | sed 's/ */ /' | cut -d' ' -f5)
+        groupadd --gid $FUSEGID --non-unique fuse
+        adduser arvbox fuse
+        adduser crunch fuse
+    fi
+fi

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


hooks/post-receive
--