From 38fffd90584a49eec1a6415732c1c5efcff40d16 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 10:19:17 -0700 Subject: [PATCH 01/10] s/opt/srv --- deployments/julia/image/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/julia/image/Dockerfile b/deployments/julia/image/Dockerfile index fc8c8ec5f..d6a669aca 100644 --- 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 From 2fb980c39b8a36c466e685f07f211aaeb9de18bd Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 10:44:08 -0700 Subject: [PATCH 02/10] debump python, seriously bump mambaforge --- deployments/julia/image/environment.yml | 4 ++-- deployments/julia/image/install-mambaforge.bash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployments/julia/image/environment.yml b/deployments/julia/image/environment.yml index a85655b8c..8c5f5fc23 100644 --- a/deployments/julia/image/environment.yml +++ b/deployments/julia/image/environment.yml @@ -1,7 +1,7 @@ dependencies: -- nodejs==18.* +- nodejs==230.9.0 - pip==22.3.1 -- python==3.11.* +- python==3.10.13 - requests==2.31.0 - syncthing==1.18.6 diff --git a/deployments/julia/image/install-mambaforge.bash b/deployments/julia/image/install-mambaforge.bash index 13f431411..ed319f83c 100755 --- 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=22.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 From d66071fc5cab83844757a8f17d93e179d7cc9948 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 10:45:09 -0700 Subject: [PATCH 03/10] typo --- deployments/julia/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/julia/image/environment.yml b/deployments/julia/image/environment.yml index 8c5f5fc23..66c17c79a 100644 --- a/deployments/julia/image/environment.yml +++ b/deployments/julia/image/environment.yml @@ -1,5 +1,5 @@ dependencies: -- nodejs==230.9.0 +- nodejs==20.9.0 - pip==22.3.1 - python==3.10.13 - requests==2.31.0 From 084acc072422e5bff9b3dd85b9fc823df236d7d7 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 10:52:23 -0700 Subject: [PATCH 04/10] wtf --- deployments/julia/image/install-mambaforge.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/julia/image/install-mambaforge.bash b/deployments/julia/image/install-mambaforge.bash index ed319f83c..d782f48f2 100755 --- 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=22.3.1-1 +MAMBAFORGE_VERSION='22.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 From 62583ff1ee37015450dbd445c6ddad8d8d2467f2 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 10:54:26 -0700 Subject: [PATCH 05/10] s/2/3 --- deployments/julia/image/install-mambaforge.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/julia/image/install-mambaforge.bash b/deployments/julia/image/install-mambaforge.bash index d782f48f2..0344ddcfa 100755 --- 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='22.3.1-1' +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 From 3ff3037a08c7d9e9ddb7cabebb47b1c8d121e82c Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 10:58:24 -0700 Subject: [PATCH 06/10] fix nodejs version --- deployments/julia/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/julia/image/environment.yml b/deployments/julia/image/environment.yml index 66c17c79a..f134c253d 100644 --- a/deployments/julia/image/environment.yml +++ b/deployments/julia/image/environment.yml @@ -1,5 +1,5 @@ dependencies: -- nodejs==20.9.0 +- nodejs==20.8.1 - pip==22.3.1 - python==3.10.13 - requests==2.31.0 From 76662facccdace600aa5c2d3dd3aed45fdf08d30 Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 14:50:12 -0700 Subject: [PATCH 07/10] debump traitlets to unbreak things --- deployments/julia/image/environment.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deployments/julia/image/environment.yml b/deployments/julia/image/environment.yml index f134c253d..72ba1ad9d 100644 --- a/deployments/julia/image/environment.yml +++ b/deployments/julia/image/environment.yml @@ -6,6 +6,9 @@ dependencies: - 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 From af9b5819056bf2cc7f97c149377d9620a2b4174b Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 15:02:25 -0700 Subject: [PATCH 08/10] bump notebook, stop pinning traitlets --- deployments/julia/image/environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployments/julia/image/environment.yml b/deployments/julia/image/environment.yml index 72ba1ad9d..82f052b76 100644 --- a/deployments/julia/image/environment.yml +++ b/deployments/julia/image/environment.yml @@ -7,7 +7,7 @@ dependencies: - syncthing==1.18.6 # bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048 -- traitlets=5.9.* +# - traitlets=5.9.* # from requirements.txt - matplotlib==3.7.2 @@ -18,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 From a1f75b1ca3bf88511e50a87796df31cbba38aced Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 15:07:02 -0700 Subject: [PATCH 09/10] twice as equals --- deployments/julia/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/julia/image/environment.yml b/deployments/julia/image/environment.yml index 82f052b76..761380996 100644 --- a/deployments/julia/image/environment.yml +++ b/deployments/julia/image/environment.yml @@ -18,6 +18,6 @@ dependencies: # For https://github.com/berkeley-dsep-infra/datahub/issues/3079 - websockify - pip: - - notebook=6.5.6 + - notebook==6.5.6 - jupyter-desktop-server - otter-grader==3.1.4 From d44417ff31f2a6470b21028392d1b37d480c3e0b Mon Sep 17 00:00:00 2001 From: shane knapp Date: Mon, 30 Oct 2023 19:19:36 -0700 Subject: [PATCH 10/10] debump traitlets --- deployments/julia/image/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/julia/image/environment.yml b/deployments/julia/image/environment.yml index 761380996..41eb14d50 100644 --- a/deployments/julia/image/environment.yml +++ b/deployments/julia/image/environment.yml @@ -7,7 +7,7 @@ dependencies: - syncthing==1.18.6 # bug w/notebook and traitlets: https://github.com/jupyter/notebook/issues/7048 -# - traitlets=5.9.* +- traitlets=5.9.* # from requirements.txt - matplotlib==3.7.2