[ARVADOS] updated: 1.3.0-2514-g0a1d82131

[Git user]

Summary of changes:
 .../arvbox/lib/arvbox/docker/service/controller/run |  2 +-
 .../arvbox/lib/arvbox/docker/service/websockets/run | 21 ++++++++++++++++++++-
 .../arvbox/docker/service/websockets/run-service    | 20 --------------------
 3 files changed, 21 insertions(+), 22 deletions(-)
 mode change 120000 => 100755 tools/arvbox/lib/arvbox/docker/service/websockets/run
 delete mode 100755 tools/arvbox/lib/arvbox/docker/service/websockets/run-service

       via  0a1d821313e6f4febdcfcb3d991ab0432e63a7d0 (commit)
      from  13cd15c1ca08ebf37fdc600dfd812159b37e8389 (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 0a1d821313e6f4febdcfcb3d991ab0432e63a7d0
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Apr 24 09:52:51 2020 -0400

    16364: Fix arvbox websockets startup
    
    Also make controller run as root to migrate to PAM
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/tools/arvbox/lib/arvbox/docker/service/controller/run b/tools/arvbox/lib/arvbox/docker/service/controller/run
index 7c16e08e2..588e9d2da 100755
--- a/tools/arvbox/lib/arvbox/docker/service/controller/run
+++ b/tools/arvbox/lib/arvbox/docker/service/controller/run
@@ -17,4 +17,4 @@ fi
 
 /usr/local/lib/arvbox/runsu.sh flock /var/lib/arvados/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
 
-exec /usr/local/lib/arvbox/runsu.sh /usr/local/bin/arvados-controller
+exec /usr/local/bin/arvados-controller
diff --git a/tools/arvbox/lib/arvbox/docker/service/websockets/run b/tools/arvbox/lib/arvbox/docker/service/websockets/run
deleted file mode 120000
index a388c8b67..000000000
--- a/tools/arvbox/lib/arvbox/docker/service/websockets/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/websockets/run b/tools/arvbox/lib/arvbox/docker/service/websockets/run
new file mode 100755
index 000000000..efa2e08a7
--- /dev/null
+++ b/tools/arvbox/lib/arvbox/docker/service/websockets/run
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+exec 2>&1
+set -ex -o pipefail
+
+. /usr/local/lib/arvbox/common.sh
+. /usr/local/lib/arvbox/go-setup.sh
+
+(cd /usr/local/bin && ln -sf arvados-server arvados-ws)
+
+if test "$1" = "--only-deps" ; then
+    exit
+fi
+
+/usr/local/lib/arvbox/runsu.sh flock /var/lib/arvados/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
+
+exec /usr/local/lib/arvbox/runsu.sh /usr/local/bin/arvados-ws
diff --git a/tools/arvbox/lib/arvbox/docker/service/websockets/run-service b/tools/arvbox/lib/arvbox/docker/service/websockets/run-service
deleted file mode 100755
index efa2e08a7..000000000
--- a/tools/arvbox/lib/arvbox/docker/service/websockets/run-service
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-exec 2>&1
-set -ex -o pipefail
-
-. /usr/local/lib/arvbox/common.sh
-. /usr/local/lib/arvbox/go-setup.sh
-
-(cd /usr/local/bin && ln -sf arvados-server arvados-ws)
-
-if test "$1" = "--only-deps" ; then
-    exit
-fi
-
-/usr/local/lib/arvbox/runsu.sh flock /var/lib/arvados/cluster_config.yml.lock /usr/local/lib/arvbox/cluster-config.sh
-
-exec /usr/local/lib/arvbox/runsu.sh /usr/local/bin/arvados-ws

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


hooks/post-receive
--