5539: Arvados-in-Docker improvements

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

diff --git a/docker/workbench/apache2_foreground.sh b/docker/workbench/apache2_foreground.sh
index 5475ff0a199e9b29bc6891968fa2f30f32b85770..1a31fb31d94056a65e08feebd81678bd5643b471 100755 (executable)
--- a/docker/workbench/apache2_foreground.sh
+++ b/docker/workbench/apache2_foreground.sh
@@ -5,7 +5,8 @@ trap "kill -TERM -$pgrp; exit" EXIT TERM KILL SIGKILL SIGTERM SIGQUIT
 
 # 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
+    sed -i "s/arvados_login_base: '.*'/arvados_login_base: 'https:\/\/$API_PORT_443_TCP_ADDR\/login'/" /usr/src/arvados/apps/workbench/config/application.yml
+    sed -i "s/arvados_v1_base: '.*'/arvados_v1_base: 'https:\/\/$API_PORT_443_TCP_ADDR\/arvados\/v1'/" /usr/src/arvados/apps/workbench/config/application.yml
 fi
 
 source /etc/apache2/envvars