3036: Merge branch 'master' into 3036-mutable-collections

[arvados.git] / docker / workbench / apache2_foreground.sh

diff --git a/docker/workbench/apache2_foreground.sh b/docker/workbench/apache2_foreground.sh
index fc6028ea8391b3445e13adc5de4439fe7207ec2d..37650ab5daf9e8f929cad41bec98e011d34b1835 100755 (executable)
--- a/docker/workbench/apache2_foreground.sh
+++ b/docker/workbench/apache2_foreground.sh
@@ -3,5 +3,15 @@
 read pid cmd state ppid pgrp session tty_nr tpgid rest < /proc/self/stat
 trap "kill -TERM -$pgrp; exit" EXIT TERM KILL SIGKILL SIGTERM SIGQUIT
 
+# Start ssh daemon if requested via the ENABLE_SSH env variable
+if [[ ! "$ENABLE_SSH" =~ (0|false|no|f|^$) ]]; then
+  /etc/init.d/ssh start
+fi
+
+# Override the default API server address if necessary.
+if [[ "$API_PORT_443_TCP_ADDR" != "" ]]; then 
+  sed -i "s/localhost:9900/$API_PORT_443_TCP_ADDR/" /usr/src/arvados/apps/workbench/config/application.yml
+fi
+
 source /etc/apache2/envvars
 /usr/sbin/apache2 -D FOREGROUND