Merge pull request #43 from UBC-DSCI/dockerfile-updates

Update R and Py Dockerfiles
UBC-DSCI · Apr 19, 2024 · e29b623 · e29b623
2 parents 7b8916c + 515164b
commit e29b623
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/docker/py-dsci-100-grading/Dockerfile b/docker/py-dsci-100-grading/Dockerfile
@@ -5,6 +5,9 @@ FROM ubcdsci/py-dsci-100:latest
 # install nbgrader and the rise slides extension
 RUN pip install jupyterlab-rise nbgrader
 
+# Allow all shortcuts
+RUN rm -f /home/${NB_USER}/.jupyter/lab/user-settings/\@jupyterlab/shortcuts-extension/shortcuts.jupyterlab-settings
+
 # Clean the cache
 RUN mamba clean --all -f -y 
 
diff --git a/docker/py-dsci-100/Dockerfile b/docker/py-dsci-100/Dockerfile
@@ -25,17 +25,19 @@ RUN mamba install --quiet --yes \
         'nodejs' \
         'psycopg2' \
         'jupyter-resource-usage' \
+        'altair-all' \
+        'pandas' \
     && mamba clean --all -f -y \
     && fix-permissions "${CONDA_DIR}" \
     && fix-permissions "/home/${NB_USER}" 
 
-# Install some recent python package that might not be on conda yet
-RUN pip install pandas"<2.1" altair"==5.0.1" "vegafusion[embed]" vl-convert-python
-
 # Install nbgitpuller, jlab-git, newest pexpect 4.9.0
 RUN pip install nbgitpuller jupyterlab-git==0.50.0 pexpect==4.9.0 \
   && jupyter lab build  
 
+# Disable announcement pop-up on start
+RUN jupyter labextension disable "@jupyterlab/apputils-extension:announcements"
+
 # Disable the cell toolbar (which ignores metadata and students often accidentally click + delete grading cells)
 RUN jupyter labextension disable @jupyterlab/cell-toolbar-extension
 
@@ -49,6 +51,7 @@ COPY jupyter_server_config.py /home/${NB_USER}/.jupyter
 COPY .gitconfig /home/${NB_USER}/
 
 USER root
+
 # Install zip package
 RUN apt install zip
 

diff --git a/docker/r-dsci-100-grading/Dockerfile b/docker/r-dsci-100-grading/Dockerfile
@@ -5,6 +5,9 @@ FROM ubcdsci/r-dsci-100:latest
 # install nbgrader and the rise slides extension
 RUN pip install jupyterlab-rise nbgrader
 
+# Allow all shortcuts
+RUN rm -f /home/${NB_USER}/.jupyter/lab/user-settings/\@jupyterlab/shortcuts-extension/shortcuts.jupyterlab-settings
+
 # Clean the cache
 RUN mamba clean --all -f -y 
 
diff --git a/docker/r-dsci-100/Dockerfile b/docker/r-dsci-100/Dockerfile
@@ -24,6 +24,7 @@ RUN mamba install --quiet --yes \
 	'r-kknn' \
 	'r-testthat' \
 	'r-rpostgres' \
+  'r-themis' \
   'jupyter-resource-usage' \
     && mamba clean --all -f -y \
     && fix-permissions "${CONDA_DIR}" \
@@ -41,6 +42,9 @@ RUN pip install nbgitpuller jupyterlab-git pexpect==4.9.0 \
 # Disable the cell toolbar (which ignores metadata and students often accidentally click + delete grading cells)
 RUN jupyter labextension disable @jupyterlab/cell-toolbar-extension
 
+# Disable announcement pop-up on start
+RUN jupyter labextension disable "@jupyterlab/apputils-extension:announcements"
+
 # Install the extension to remove the shift+M merge shortcut
 COPY shortcuts.jupyterlab-settings /home/${NB_USER}/.jupyter/lab/user-settings/\@jupyterlab/shortcuts-extension/shortcuts.jupyterlab-settings