diff --git a/05_setup_rsession_parameters.sh b/05_setup_rsession_parameters.sh index 64423b6..78e4d87 100644 --- a/05_setup_rsession_parameters.sh +++ b/05_setup_rsession_parameters.sh @@ -3,11 +3,11 @@ echo "session-timeout-minutes=360" >> /etc/rstudio/rsession.conf echo "session-disconnected-timeout-minutes=360" >> /etc/rstudio/rsession.conf echo "session-quit-child-processes-on-exit=0" >> /etc/rstudio/rsession.conf -echo "session-default-working-dir=~" >> /etc/rstudio/rsession.conf -echo "session-default-new-project-dir=~" >> /etc/rstudio/rsession.conf -echo "session-save-action-default=yes" >> /etc/rstudio/rsession.conf +#echo "session-default-working-dir=~" >> /etc/rstudio/rsession.conf +#echo "session-default-new-project-dir=~" >> /etc/rstudio/rsession.conf +#echo "session-save-action-default=yes" >> /etc/rstudio/rsession.conf echo "allow-shell=0" >> /etc/rstudio/rsession.conf -echo "allow-terminal-websockets=1" >> /etc/rstudio/rsession.conf +#echo "allow-terminal-websockets=1" >> /etc/rstudio/rsession.conf echo "limit-cpu-time-minutes=0" >> /etc/rstudio/rsession.conf echo "limit-file-upload-size-mb=0" >> /etc/rstudio/rsession.conf -echo "limit-xfs-disk-quota=no" >> /etc/rstudio/rsession.conf +#echo "limit-xfs-disk-quota=no" >> /etc/rstudio/rsession.conf diff --git a/Dockerfile b/Dockerfile index 37aa08c..a3a9f89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,7 @@ ADD https://code-repo.d4science.org/gCubeSystem/r-packages-list/raw/branch/maste #RUN for g in `cat /tmp/r_github_pkgs.txt` ; do installGithub.r -d TRUE -u FALSE -r https://packagemanager.rstudio.com/all/__linux__/focal/latest $g ; done #RUN grep -v "GITHUB_PATH" /etc/R/Renviron.site > /etc/R/Renviron.site.1 #RUN mv -f /etc/R/Renviron.site.1 /etc/R/Renviron.site -#RUN installGithub.r -d TRUE -u FALSE -r https://packagemanager.rstudio.com/all/__linux__/focal/latest DanOvando/sraplus ; done +RUN installGithub.r -d TRUE -u FALSE -r https://packagemanager.rstudio.com/all/__linux__/focal/latest DanOvando/sraplus ; done # Ensure that we remove the source packages RUN rm -fr /tmp/downloaded_packages/* @@ -61,8 +61,7 @@ RUN rm -fr /tmp/downloaded_packages/* RUN /rocker_scripts/install_rstudio.sh RUN /rocker_scripts/install_pandoc.sh -# Remove the rstudio user's home directory and add the mountpoint for the workspace -RUN rm -fr /home/rstudio +# Add the mountpoint for the workspace RUN mkdir /workspace # This part comes from https://github.com/openanalytics/shinyproxy-rstudio-ide-demo/blob/master/Dockerfile