[ARVADOS] updated: 1.1.4-698-gd63984fdc

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/service/doc/run           | 10 +++++++++-
 tools/arvbox/lib/arvbox/docker/service/doc/run-service   |  2 --
 tools/arvbox/lib/arvbox/docker/service/ready/run         | 10 +++++++++-
 tools/arvbox/lib/arvbox/docker/service/ready/run-service |  2 --
 4 files changed, 18 insertions(+), 6 deletions(-)
 mode change 120000 => 100755 tools/arvbox/lib/arvbox/docker/service/doc/run
 mode change 120000 => 100755 tools/arvbox/lib/arvbox/docker/service/ready/run

       via  d63984fdc1cf7c48cab9a57640415e85c8bfc48f (commit)
      from  cec8e2705d260c9df1042858941419a3b9160c0e (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 d63984fdc1cf7c48cab9a57640415e85c8bfc48f
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jul 23 14:33:02 2018 -0400

    Arvbox fix correct permissions to stop one-shot services. no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/service/doc/run b/tools/arvbox/lib/arvbox/docker/service/doc/run
deleted file mode 120000
index a388c8b67..000000000
--- a/tools/arvbox/lib/arvbox/docker/service/doc/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/lib/arvbox/runsu.sh
\ No newline at end of file
diff --git a/tools/arvbox/lib/arvbox/docker/service/doc/run b/tools/arvbox/lib/arvbox/docker/service/doc/run
new file mode 100755
index 000000000..e83db3f16
--- /dev/null
+++ b/tools/arvbox/lib/arvbox/docker/service/doc/run
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+set -e
+
+/usr/local/lib/arvbox/runsu.sh $0-service
+sv stop doc
diff --git a/tools/arvbox/lib/arvbox/docker/service/doc/run-service b/tools/arvbox/lib/arvbox/docker/service/doc/run-service
index 83225ed0b..ea66cfd7a 100755
--- a/tools/arvbox/lib/arvbox/docker/service/doc/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/doc/run-service
@@ -20,5 +20,3 @@ fi
 
 cd /usr/src/arvados/doc
 bundle exec rake generate baseurl=http://$localip:${services[doc]} arvados_api_host=$localip:${services[controller-ssl]} arvados_workbench_host=http://$localip
-
-sv stop doc >/dev/null
diff --git a/tools/arvbox/lib/arvbox/docker/service/ready/run b/tools/arvbox/lib/arvbox/docker/service/ready/run
deleted file mode 120000
index a388c8b67..000000000
--- a/tools/arvbox/lib/arvbox/docker/service/ready/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/lib/arvbox/runsu.sh
\ No newline at end of file
diff --git a/tools/arvbox/lib/arvbox/docker/service/ready/run b/tools/arvbox/lib/arvbox/docker/service/ready/run
new file mode 100755
index 000000000..904476af7
--- /dev/null
+++ b/tools/arvbox/lib/arvbox/docker/service/ready/run
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+set -e
+
+/usr/local/lib/arvbox/runsu.sh $0-service
+sv stop ready
diff --git a/tools/arvbox/lib/arvbox/docker/service/ready/run-service b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
index cfd7d5aa5..7766fb7ec 100755
--- a/tools/arvbox/lib/arvbox/docker/service/ready/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/ready/run-service
@@ -93,5 +93,3 @@ echo "Your Arvados-in-a-box is ready!"
 echo "Workbench is running at http://$localip"
 
 rm -r /tmp/arvbox-ready
-
-sv stop ready >/dev/null

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


hooks/post-receive
--