add new RStudio version

davelopez · Nov 18, 2024 · f5c2141 · f5c2141
1 parent f974b98
commit f5c2141
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/tools/interactive/interactivetool_rstudio.xml b/tools/interactive/interactivetool_rstudio.xml
@@ -1,6 +1,6 @@
-<tool id="interactive_tool_rstudio" tool_type="interactive" name="RStudio" version="0.3" profile="22.01">
+<tool id="interactive_tool_rstudio" tool_type="interactive" name="RStudio" version="24.1" profile="22.01">
     <requirements>
-        <container type="docker">quay.io/galaxy/docker-rstudio-notebook:23.1</container>
+        <container type="docker">quay.io/galaxy/docker-rstudio-notebook:24.1</container>
     </requirements>
     <entry_points>
         <entry_point name="RStudio" requires_domain="False" requires_path_in_header_named="X-RStudio-Root-Path">
@@ -26,7 +26,6 @@
 
         /init &
         sleep 5 &&
-
         chmod 777 /tmp -R &&
         tail --retry -f /var/log/rstudio/rstudio-server/rserver.log
 

diff --git a/tools/interactive/interactivetool_rstudio_0_3.xml b/tools/interactive/interactivetool_rstudio_0_3.xml
@@ -4,37 +4,33 @@
         <container type="docker">quay.io/galaxy/docker-rstudio-notebook:23.1</container>
     </requirements>
     <entry_points>
-        <entry_point name="RStudio" requires_domain="True">
+        <entry_point name="RStudio" requires_domain="False" requires_path_in_header_named="X-RStudio-Root-Path">
             <port>8787</port>
             <url>/</url>
         </entry_point>
     </entry_points>
     <environment_variables>
-        <environment_variable name="HISTORY_ID">$__history_id__</environment_variable>
-        <environment_variable name="REMOTE_HOST">$__galaxy_url__</environment_variable>
+        <environment_variable name="HISTORY_ID" strip="True">${__app__.security.encode_id($jupyter_notebook.history_id)}</environment_variable> <!-- FIXME: Warning: The use of __app__ is deprecated and will break backward compatibility in the near future -->
         <environment_variable name="GALAXY_WEB_PORT">8080</environment_variable>
         <environment_variable name="GALAXY_URL">$__galaxy_url__</environment_variable>
         <environment_variable name="DEBUG">true</environment_variable>
         <environment_variable name="DISABLE_AUTH">true</environment_variable>
         <environment_variable name="API_KEY" inject="api_key" />
     </environment_variables>
     <command><![CDATA[
-        chmod 777 \$TMPDIR &&
-        #import re
+        #chmod 777 \$TMPDIR &&
         export GALAXY_WORKING_DIR=`pwd` &&
         mkdir -p ./rstudio/outputs/ &&
         mkdir -p ./rstudio/data &&
 
         ## change into the directory where the notebooks are located
         cd ./rstudio/ &&
 
-        ##sed -i 's|/monitor.*||g' /etc/services.d/nginx/run &&
-        ##/etc/init.d/syslog-ng start &&
         /init &
-        ##rstudio-server start &&
         sleep 5 &&
         chmod 777 /tmp -R &&
-        tail -f /var/log/rstudio/rstudio-server/rserver.log
+        tail --retry -f /var/log/rstudio/rstudio-server/rserver.log
+
     ]]>
     </command>
     <inputs>