[ARVADOS-DEV] updated: 02c3150928209dfd5adcd107760637a4256fb902

[git at public.curoverse.com]

Summary of changes:
 arvbox/bin/arvbox                                  | 1 +
 arvbox/lib/arvbox/docker/createusers.sh            | 2 +-
 arvbox/lib/arvbox/docker/service/ready/run-service | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

       via  02c3150928209dfd5adcd107760637a4256fb902 (commit)
      from  80391687c4cdf1ab167e67f9a48d4c7354c3a4d8 (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 02c3150928209dfd5adcd107760637a4256fb902
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jan 18 16:21:54 2016 -0500

    8080: Fixes for "publicdemo" mode

diff --git a/arvbox/bin/arvbox b/arvbox/bin/arvbox
index 73c3803..bcc9113 100755
--- a/arvbox/bin/arvbox
+++ b/arvbox/bin/arvbox
@@ -101,6 +101,7 @@ run() {
         localip=$(ip addr show $defaultdev | grep 'inet ' | sed 's/ *inet \(.*\)\/.*/\1/')
         iptemp=$(tempfile)
         echo $localip > $iptemp
+        chmod og+r $iptemp
         PUBLIC="--volume=$iptemp:/var/run/localip_override
               --publish=80:80
               --publish=8000:8000
diff --git a/arvbox/lib/arvbox/docker/createusers.sh b/arvbox/lib/arvbox/docker/createusers.sh
index a90992a..cc7e11f 100755
--- a/arvbox/lib/arvbox/docker/createusers.sh
+++ b/arvbox/lib/arvbox/docker/createusers.sh
@@ -20,7 +20,7 @@ if ! grep "^arvbox:" /etc/passwd >/dev/null 2>/dev/null ; then
     useradd --home-dir /var/lib/arvados/git --uid $HOSTUID --gid $HOSTGID --non-unique git
     useradd --groups docker,fuse crunch
 
-    chown arvbox:arvbox -R /usr/local /var/lib/arvados /var/lib/gems /var/lib/passenger
+    chown arvbox:arvbox -R /usr/local /var/lib/arvados /var/lib/gems /var/lib/passenger /var/lib/postgresql
 
     mkdir -p /var/lib/gems/ruby/2.1.0
     chown arvbox:arvbox -R /var/lib/gems/ruby/2.1.0
diff --git a/arvbox/lib/arvbox/docker/service/ready/run-service b/arvbox/lib/arvbox/docker/service/ready/run-service
index c027360..f560de0 100755
--- a/arvbox/lib/arvbox/docker/service/ready/run-service
+++ b/arvbox/lib/arvbox/docker/service/ready/run-service
@@ -21,7 +21,7 @@ waiting=""
 for s in "${!services[@]}"
 do
   if ! [[ -f /tmp/arvbox-ready/$s ]] ; then
-    if nc -z $localip ${services[$s]} ; then
+    if nc -z localhost ${services[$s]} ; then
       echo "$s is ready at $localip:${services[$s]}"
       touch /tmp/arvbox-ready/$s
     else

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


hooks/post-receive
--