Merge branch '19954-permission-dedup-doc'

[arvados.git] / tools / arvbox / lib / arvbox / docker / service / workbench / run

diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run b/tools/arvbox/lib/arvbox/docker/service/workbench/run
index 6ac04769961623d1bbca47cfd9ef9042d958c76f..1b0ca47a3602277936b561233c87eecb0c3bf933 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run
@@ -1,6 +1,12 @@
-#!/bin/sh
+#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 set -e
 
+.  /usr/local/lib/arvbox/common.sh
+
 /usr/local/lib/arvbox/runsu.sh $0-service $1
 
 cd /usr/src/arvados/apps/workbench
@@ -9,7 +15,16 @@ rm -rf tmp
 mkdir tmp
 chown arvbox:arvbox tmp
 
+if test -s $ARVADOS_CONTAINER_PATH/workbench_rails_env ; then
+  export RAILS_ENV=$(cat $ARVADOS_CONTAINER_PATH/workbench_rails_env)
+else
+  export RAILS_ENV=development
+fi
+
 if test "$1" != "--only-deps" ; then
-    exec bundle exec passenger start --port 80 \
-         --user arvbox --runtime-dir=/var/lib/passenger
+    openssl verify -CAfile $root_cert $server_cert
+    exec binstubs/passenger start --port=${services[workbench]} \
+        --ssl --ssl-certificate=$ARVADOS_CONTAINER_PATH/server-cert-${localip}.pem \
+        --ssl-certificate-key=$ARVADOS_CONTAINER_PATH/server-cert-${localip}.key \
+         --user arvbox
 fi