Merge remote-tracking branch 'remotes/origin/r'

# Conflicts:
#	Dockerfile

Dockerfile

@@ -4,7 +4,7 @@
 # base notebook, contains Jupyter and relevant tools
 # See https://github.com/ucsd-ets/datahub-docker-stack/wiki/Stable-Tag
 # for a list of the most current containers we maintain
-ARG BASE_CONTAINER=ucsdets/datahub-base-notebook:2023.2-stable
+ARG BASE_CONTAINER=ucsdets/rstudio-notebook:2023.2-stable
 
 FROM $BASE_CONTAINER
 
@@ -16,26 +16,8 @@ USER root
 COPY run_jupyter.sh /
 RUN chmod +x /run_jupyter.sh
 
-# RUN apt-get -y install htop
-# RUN pip install --no-cache-dir \
-#     keras==2.6.0 \
-#     tensorflow==2.8 \
-#     tensorflow-gpu==2.8 && \
-#     fix-permissions $CONDA_DIR && \
-#     fix-permissions /home/$NB_USER
-
-# 3) install packages using notebook user
-RUN conda install nb_conda_kernels
-ARG KERNEL=cse41305
-ENV CONDA_PREFIX=/opt/conda/envs/${KERNEL}
-COPY env.yml /tmp
-#ENV CONDA_CUDA_OVERRIDE="11.2"
-RUN conda env create --file /tmp/env.yml && \
-    eval "$(conda shell.bash hook)" && \
-    conda activate ${KERNEL} && \
-    mkdir -p $CONDA_PREFIX/etc/conda/activate.d && \
-    echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CONDA_PREFIX/lib/' > $CONDA_PREFIX/etc/conda/activate.d/env_vars.sh && \
-    python -m ipykernel install --name=${KERNEL}
+RUN mamba install -c conda-forge r-neuralnet 
+
 
 USER jovyan