Merge pull request #5179 from berkeley-dsep-infra/staging

merging 5174/5176/5178 to prod
berkeley-dsep-infra · Oct 31, 2023 · 36efcad · 36efcad
2 parents aa12003 + a4f8764
commit 36efcad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/deployments/julia/image/Dockerfile b/deployments/julia/image/Dockerfile
@@ -8,8 +8,8 @@ ENV NB_USER jovyan
 ENV NB_UID 1000
 ENV SHELL /bin/bash
 
-ENV CONDA_DIR /opt/conda
-ENV JULIA_DIR /opt/julia
+ENV CONDA_DIR /srv/conda
+ENV JULIA_DIR /srv/julia
 
 ENV PATH ${JULIA_DIR}/bin:${CONDA_DIR}/bin:$PATH
 

diff --git a/deployments/julia/image/environment.yml b/deployments/julia/image/environment.yml
@@ -1,11 +1,14 @@
 dependencies:
-- nodejs==18.*
+- nodejs==20.8.1
 - pip==22.3.1
-- python==3.11.*
+- python==3.10.13
 - requests==2.31.0
 
 - syncthing==1.18.6
 
+# bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048
+- traitlets=5.9.*
+
 # from requirements.txt
 - matplotlib==3.7.2
 
@@ -15,5 +18,6 @@ dependencies:
 # For https://github.com/berkeley-dsep-infra/datahub/issues/3079
 - websockify
 - pip:
+  - notebook==6.5.6
   - jupyter-desktop-server
   - otter-grader==3.1.4
diff --git a/deployments/julia/image/install-mambaforge.bash b/deployments/julia/image/install-mambaforge.bash
@@ -3,7 +3,7 @@
 set -ex
 
 cd $(dirname $0)
-MAMBAFORGE_VERSION=4.10.3-7
+MAMBAFORGE_VERSION='23.3.1-1'
 
 URL="https://github.com/conda-forge/miniforge/releases/download/${MAMBAFORGE_VERSION}/Mambaforge-${MAMBAFORGE_VERSION}-Linux-x86_64.sh"
 INSTALLER_PATH=/tmp/mambaforge-installer.sh