[ARVADOS] updated: 57d004018f00b864dc883d9ff1ed508e57396095

[git at public.curoverse.com]

Summary of changes:
 docker/arvdock         | 6 ++++--
 docker/keep/Dockerfile | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

       via  57d004018f00b864dc883d9ff1ed508e57396095 (commit)
       via  96e1e7d819e587e20752ba46d89ae6f9a217903b (commit)
       via  f516aad961fde5430e7da2e3f812279ab730ad31 (commit)
      from  5f6af45e3f79b2dbff55e821465f3d599a9e44e6 (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 57d004018f00b864dc883d9ff1ed508e57396095
Merge: 96e1e7d 5f6af45
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 15:29:48 2014 -0400

    Merge remote-tracking branch 'origin/3261-keep-docker-config' into 3261-keep-docker-config

diff --cc docker/keep/Dockerfile
index 706e93a,fd93247..240cb39
--- a/docker/keep/Dockerfile
+++ b/docker/keep/Dockerfile
@@@ -11,9 -11,9 +11,11 @@@ RUN /usr/bin/apt-get updat
  RUN /usr/bin/apt-get install keep
  
  ADD generated/run-keep /usr/local/bin/
 +RUN chmod +x /usr/local/bin/run-keep
 +
  ADD generated/keep_signing_secret /etc/
  
+ RUN /bin/chmod a+x /usr/local/bin/run-keep
+ 
  # Start keep
  CMD ["/usr/local/bin/run-keep"]

commit 96e1e7d819e587e20752ba46d89ae6f9a217903b
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 15:26:34 2014 -0400

    3261: Fix permissions on run-keep script

diff --git a/docker/keep/Dockerfile b/docker/keep/Dockerfile
index e342c8d..706e93a 100644
--- a/docker/keep/Dockerfile
+++ b/docker/keep/Dockerfile
@@ -11,6 +11,8 @@ RUN /usr/bin/apt-get update
 RUN /usr/bin/apt-get install keep
 
 ADD generated/run-keep /usr/local/bin/
+RUN chmod +x /usr/local/bin/run-keep
+
 ADD generated/keep_signing_secret /etc/
 
 # Start keep

commit f516aad961fde5430e7da2e3f812279ab730ad31
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 31 15:26:21 2014 -0400

    3261: Improve status reporting

diff --git a/docker/arvdock b/docker/arvdock
index 0122fc3..e36e5cf 100755
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -83,11 +83,11 @@ function start_container {
     #echo "  $DOCKER run --dns=127.0.0.1 $args $image"
     echo "  $DOCKER run $args $image"
     container=`$DOCKER run $args $image`
-    if [[ "$?" != "0" ]]; then
+    if [ "$?" != "0" -o "$container" = "" ]; then
       echo "Unable to start container"
       exit 1
     fi
-    if [[ "$name" == "compute" || "$ENABLE_SSH" != "false" ]];
+    if [ "$name" == "compute" -o "$ENABLE_SSH" != "false" ];
     then
       ip=$(ip_address $container )
       echo
@@ -95,6 +95,8 @@ function start_container {
       echo
       echo "    ssh root@$ip"
       echo
+    else
+      echo "Started container: $container"
     fi
 
     if [[ "$name" == "doc_server" ]]; then

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


hooks/post-receive
--