diff --git a/images/rstudio-notebook/Dockerfile b/images/rstudio-notebook/Dockerfile index c8e5fbb0..fa0d9050 100644 --- a/images/rstudio-notebook/Dockerfile +++ b/images/rstudio-notebook/Dockerfile @@ -6,23 +6,19 @@ FROM ghcr.io/ucsd-ets/datascience-notebook:${BASE_TAG} USER root # Follow instructions atL https://www.rstudio.com/products/rstudio/download-server/ -ENV RSTUDIO_PKG=rstudio-server-1.4.1717-amd64.deb \ - RSESSION_PROXY_RSTUDIO_1_4=true -ENV RSTUDIO_URL=https://download2.rstudio.org/server/bionic/amd64/${RSTUDIO_PKG} +ENV RSTUDIO_PKG=rstudio-server-2023.09.0-463-amd64.deb +ENV RSTUDIO_URL=https://download2.rstudio.org/server/focal/amd64/${RSTUDIO_PKG} # rstudio installation expects R to live under /usr/bin, /bin/, etc. RUN ln -s /opt/conda/bin/R /usr/bin/R && \ - gpg --keyserver keyserver.ubuntu.com --recv-key E331692F && \ apt-get update && \ apt-get -qq install -y apt-utils gdebi-core dpkg-sig && \ - curl -L ${RSTUDIO_URL} > ${RSTUDIO_PKG} && \ - dpkg-sig --verify ${RSTUDIO_PKG} && \ + wget ${RSTUDIO_URL} && \ gdebi -n ${RSTUDIO_PKG} && \ rm -f ${RSTUDIO_PKG} && \ echo '/opt/conda/lib/R/lib' > /etc/ld.so.conf.d/r.conf && /sbin/ldconfig -v && \ apt-get clean && rm -rf /var/lib/apt/lists/* && \ rm -f /usr/bin/R && \ - rm /var/lib/rstudio-server/rstudio.sqlite && \ chmod -R g=u /var/lib/rstudio-server # Revert to 1.0b6 to correct terminal bug (see https://github.com/jupyterhub/jupyter-rsession-proxy/issues/71) @@ -45,7 +41,8 @@ ENV PATH="${PATH}:/usr/lib/rstudio-server/bin" \ COPY ./lib /opt/k8s-support/lib RUN R -e "install.packages('rjson', repos='http://cran.rstudio.com/')" && \ - R -e "install.packages('session', repos='http://cran.rstudio.com/')" + R -e "install.packages('session', repos='http://cran.rstudio.com/')" && \ + R -e "install.packages('rmarkdown', repos='http://cran.rstudio.com/')" COPY ./test ./integration_tests /home/jovyan/ #/usr/share/datahub/tests/datascience-rstudio-docker