export PORT

Azure · Sep 28, 2023 · aeec8fb · aeec8fb
1 parent bd9637b
commit aeec8fb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/playbooks/roles/ood-applications/files/bc_rstudio/template/before.sh.erb b/playbooks/roles/ood-applications/files/bc_rstudio/template/before.sh.erb
@@ -3,4 +3,10 @@ THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 [[ $(type -t module) == "function" ]] && export -f module
 
 # Find available port to run server on
-port=$(find_port ${host})
+export port=$(find_port ${host})
+
+<%- if OodAppkit.clusters[context.cluster].job_config[:adapter] == 'pbspro' -%>
+# TODO : Use the job ID for the container name
+export CONTAINER_NAME=rstudio.$PBS_JOBID
+$THIS_DIR/get_container.sh <%=context.container_image%> $CONTAINER_NAME
+<%- end -%>
diff --git a/playbooks/roles/ood-applications/files/bc_rstudio/template/start_container.sh b/playbooks/roles/ood-applications/files/bc_rstudio/template/start_container.sh
@@ -7,6 +7,6 @@ container_name=$1
 
 echo "container_name=$container_name"
 echo "enroot start"
-enroot start --rw -e NOTEBOOK_ROOT="$NOTEBOOK_ROOT" -e CONFIG_FILE="$CONFIG_FILE" $container_name $THIS_DIR/start_rstudio.sh
+enroot start --rw -e NOTEBOOK_ROOT="$NOTEBOOK_ROOT" -e CONFIG_FILE="$CONFIG_FILE" -e PORT="$port" $container_name $THIS_DIR/start_rstudio.sh
 echo "enroot remove"
 enroot remove -f $container_name
diff --git a/playbooks/roles/ood-applications/files/bc_rstudio/template/start_rstudio.sh b/playbooks/roles/ood-applications/files/bc_rstudio/template/start_rstudio.sh
@@ -12,4 +12,4 @@ EOF
 
 # Launch the Rstudio server
 set -x
-/usr/lib/rstudio-server/bin/rserver --www-port ${port}
+/usr/lib/rstudio-server/bin/rserver --www-port ${PORT}