Merge pull request 'Try to fix the x-frame-origin problem.' (#8) from andrea.dellamico/docker-jenkins-integration-test:master into master

Reviewed-on: #8
This commit is contained in:
Andrea Dell'Amico 2022-03-30 11:26:55 +02:00
commit a88aab002e
3 changed files with 5 additions and 3 deletions

View File

@ -1,3 +1,5 @@
#!/usr/bin/with-contenv bash
printenv >> /etc/R/Renviron.site
printenv >> /home/$USER/.Renviron

View File

@ -1,7 +1,7 @@
#!/usr/bin/with-contenv bash
echo "session-timeout-minutes=360" >> /etc/rstudio/rsession.conf
echo "session-disconnected-timeout-minutes=360" >> /etc/rstudio/rsession.conf
echo "session-timeout-minutes=7200" >> /etc/rstudio/rsession.conf
echo "session-disconnected-timeout-minutes=1440" >> /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

View File

@ -65,7 +65,7 @@ RUN /rocker_scripts/install_pandoc.sh
RUN mkdir /workspace
# This part comes from https://github.com/openanalytics/shinyproxy-rstudio-ide-demo/blob/master/Dockerfile
RUN echo "www-frame-origin=disabled" >> /etc/rstudio/disable_auth_rserver.conf
RUN echo "www-frame-origin=same" >> /etc/rstudio/disable_auth_rserver.conf
RUN echo "www-verify-user-agent=0" >> /etc/rstudio/disable_auth_rserver.conf
ADD 03_setup_root_path.sh /etc/cont-init.d/03_setup_root_path.sh