diff --git a/Dockerfile b/Dockerfile index 4a8b528..e9b9108 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,8 +42,7 @@ ARG EXCLUDE_VARS="HOME PASSWORD RSTUDIO_VERSION BATCH_USER_CREATION" ARG R_HOME="/usr/local" # The 0*_ scripts cannot be used anymore # ADD 01_set_env.sh /etc/cont-init.d/01_set_env -RUN for file in /var/run/s6/container_environment/* ; do sed -i "/^${file##*/}=/d" ${R_HOME}/etc/Renviron.site ; regex="(^| )${file##*/}($| )" ; - if [ ! $exclude_vars =~ $regex ] ; then echo "${file##*/}=$(cat $file)" >> ${R_HOME}/etc/Renviron.site ; fi ; done +RUN for file in /var/run/s6/container_environment/* ; do sed -i "/^${file##*/}=/d" ${R_HOME}/etc/Renviron.site ; regex="(^| )${file##*/}($| )" ; if [ ! $exclude_vars =~ $regex ] ; then echo "${file##*/}=$(cat $file)" >> ${R_HOME}/etc/Renviron.site ; fi ; done # ADD 02_userconf.sh /etc/cont-init.d/02_userconf RUN mv -f /etc/rstudio/disable_auth_rserver.conf /etc/rstudio/rserver.conf