From fcdaf7fd81fc9f696537d7e5211f68626f0d3138 Mon Sep 17 00:00:00 2001
From: dafeliton <dafeliton@ucsd.edu>
Date: Wed, 6 Mar 2024 12:35:34 -0800
Subject: [PATCH] Downgrade rstudio

---
 images/datascience-notebook/Dockerfile | 1 -
 images/rstudio-notebook/Dockerfile     | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/images/datascience-notebook/Dockerfile b/images/datascience-notebook/Dockerfile
index a12f491c..10176020 100644
--- a/images/datascience-notebook/Dockerfile
+++ b/images/datascience-notebook/Dockerfile
@@ -8,7 +8,6 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NOWARNINGS="yes"
 RUN apt-get update -y && \
     apt-get -qq install -y --no-install-recommends \
-    BADBADBAD \
     git \
     curl \
     rsync \
diff --git a/images/rstudio-notebook/Dockerfile b/images/rstudio-notebook/Dockerfile
index 3529a4fc..90a20029 100644
--- a/images/rstudio-notebook/Dockerfile
+++ b/images/rstudio-notebook/Dockerfile
@@ -1,8 +1,10 @@
 ARG BASE_TAG=latest
-FROM ghcr.io/ucsd-ets/datascience-notebook:${BASE_TAG}
+FROM ghcr.io/ucsd-ets/datascience-notebook:2024.3-scipy-ml-fixup
 
 USER root
 
+RUN mamba install r-base=4.1.3 -c conda-forge
+
 # RStudio Setup
 ## Follow instructions at https://www.rstudio.com/products/rstudio/download-server/
 ENV RSTUDIO_PKG=rstudio-server-2023.12.1-402-amd64.deb
@@ -17,7 +19,8 @@ RUN ln -s /opt/conda/bin/R /usr/bin/R && \
     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 && \
-    chmod -R g=u /var/lib/rstudio-server
+    chmod -R g=u /var/lib/rstudio-server && \
+    service rstudio-server restart
 
 RUN pip install jupyter-rsession-proxy