diff --git a/images/rstudio-notebook/Dockerfile b/images/rstudio-notebook/Dockerfile index ed0c5c50..06272b4f 100644 --- a/images/rstudio-notebook/Dockerfile +++ b/images/rstudio-notebook/Dockerfile @@ -25,15 +25,17 @@ RUN ln -s /opt/conda/bin/R /usr/bin/R && \ RUN pip install jupyter-rsession-proxy -RUN mkdir -p /etc/rstudio && echo 'auth-minimum-user-id=100' >> /etc/rstudio/rserver.conf +RUN mkdir -p /etc/rstudio && \ + echo 'auth-minimum-user-id=100' >> /etc/rstudio/rserver.conf && \ + echo 'rsession-ld-library-path=/opt/conda/lib' >> /etc/rstudio/rserver.conf ## Shim in our nss-wrapper so that user getpwent() lookups succeed RUN ( echo 'LD_PRELOAD=/opt/k8s-support/lib/libnss_wrapper.so'; echo 'NSS_WRAPPER_PASSWD=/tmp/passwd.wrap'; echo 'NSS_WRAPPER_GROUP=/tmp/group.wrap') >> /opt/conda/lib/R/etc/Renviron.site ## The desktop package uses /usr/lib/rstudio/bin ENV PATH="${PATH}:/usr/lib/rstudio-server/bin" \ - SHELL=/bin/bash \ - LD_LIBRARY_PATH="/opt/conda/lib:/usr/lib/x86_64-linux-gnu:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server:/opt/conda/lib/R/lib" + SHELL=/bin/bash + #LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu:/opt/conda/lib/R/lib" COPY ./lib /opt/k8s-support/lib