Skip to content

Commit 10bb076

Browse files
authored
fix(jupyterhub): Push a newer image with a more updated node version
1 parent 5e22e35 commit 10bb076

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

images/jupyter-singleuser/Dockerfile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM jupyter/datascience-notebook:python-3.11.6
2-
1+
FROM quay.io/jupyter/datascience-notebook:python-3.11.10
32
LABEL org.opencontainers.image.source=https://github.com/cal-itp/data-infra
43

54
USER root
65
RUN apt-get update
76
RUN apt-get install -y ca-certificates curl gnupg
87
RUN mkdir -p /etc/apt/keyrings
98
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
10-
RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
9+
# I don't think this nodejs gets used.
10+
RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
1111
RUN apt update \
1212
&& apt-get install -y keychain nodejs git-lfs libspatialindex-dev graphviz libgraphviz-dev
1313
# GitHub CLI https://github.com/cli/cli/blob/trunk/docs/install_linux.md
@@ -16,7 +16,7 @@ RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/g
1616
RUN apt update \
1717
&& apt install -y gh
1818
RUN apt-get install -y gdal-bin libgdal-dev # for rasterio
19-
# create these ahead of time, then chown to to the notebook user
19+
# create these ahead of time, then chown to the notebook user
2020
ENV GCLOUD_HOME=/gcloud
2121
ENV POETRY_HOME="/poetry"
2222
RUN mkdir $POETRY_HOME \
@@ -29,13 +29,11 @@ USER $NB_UID
2929
RUN curl -sSL https://install.python-poetry.org | python3 -
3030
ENV PATH="$POETRY_HOME/bin:$PATH"
3131
RUN npm install -g --unsafe-perm=true --allow-root netlify-cli
32-
# RUN npm install -g --unsafe-perm=true --allow-root vega-cli # Can't get these to work
33-
# RUN npm install -g --unsafe-perm=true --allow-root vega-lite
3432
RUN npm install -g --unsafe-perm=true --allow-root sql-language-server
3533
# gcloud CLI https://cloud.google.com/sdk/docs/install#deb
3634
RUN cd $GCLOUD_HOME \
37-
&& curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-506.0.0-linux-x86_64.tar.gz \
38-
&& tar -zxvf google-cloud-cli-506.0.0-linux-x86_64.tar.gz \
35+
&& curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-512.0.0-linux-x86_64.tar.gz \
36+
&& tar -zxvf google-cloud-cli-512.0.0-linux-x86_64.tar.gz \
3937
&& ./google-cloud-sdk/install.sh
4038
ENV PATH="$GCLOUD_HOME/google-cloud-sdk/bin:$PATH"
4139

@@ -46,7 +44,6 @@ RUN poetry config virtualenvs.create false
4644
RUN cd /reqs && poetry install --with=shared_utils --with=portfolio
4745
RUN cd /reqs && poetry show # print out the package versions for documentation
4846
RUN poetry config virtualenvs.create true
49-
5047
ENV DBT_PROFILES_DIR=/home/jovyan/.dbt/
5148
COPY ./overrides.json /opt/conda/share/jupyter/lab/settings/overrides.json
5249
COPY ./dask_config.yml /opt/conda/etc/dask/dask_config.yml

images/jupyter-singleuser/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ docker build -t envs-hurt . 2>&1 | tee build.log
2121

2222
You can go into the docker image and do tests:
2323
```
24-
docker images
25-
docker exec -it upbeat_bhaskara /bin/bash
24+
docker run -it envs-hurt bash
2625
```
2726

2827
## Deploying Changes to Production

images/jupyter-singleuser/pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "jupyter-singleuser"
3-
version = "2025.2.20"
3+
version = "2025.2.26"
44
description = ""
55
package-mode = false
66
authors = ["Vevetron"]
@@ -15,8 +15,7 @@ intake-parquet = ">=0.2.3"
1515
ipyleaflet = "0.15.0"
1616
jupytext = ">=1.13.5"
1717
jupyterlab-code-formatter = ">=1.4.10"
18-
lxml_html_clean = ">=0.4.1" #To stop some background error messages
19-
# voila = "0.5.8"
18+
lxml_html_clean = ">=0.4.1"
2019
plotnine = ">=0.8.0"
2120
plotly = "5.5.0"
2221
folium = ">=0.12.1.post1"

kubernetes/apps/charts/jupyterhub/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jupyterhub:
99
startTimeout: 300
1010
image:
1111
name: ghcr.io/cal-itp/data-infra/jupyter-singleuser
12-
tag: 2025.2.20
12+
tag: 2025.2.26
1313
memory:
1414
# Much more than 10 and we risk bumping up against the actual capacity of e2-highmem-2
1515
limit: 10G
@@ -31,10 +31,10 @@ jupyterhub:
3131
mkdir -p -- /home/jovyan/.jupyter;
3232
cp /tmp/jupyter_notebook_config.py /home/jovyan/.jupyter/jupyter_notebook_config.py;
3333
profileList:
34-
- display_name: "Default User - 2025.2.20, Python 3.11"
34+
- display_name: "Default User - 2025.2.26, Python 3.11"
3535
description: "Your code will run on a shared machine with 3–10G of memory and 0.7–1.9 CPU cores."
3636
default: true
37-
- display_name: "Power User - 2025.2.20, Python 3.11"
37+
- display_name: "Power User - 2025.2.26, Python 3.11"
3838
description: "Your code will run on a shared machine with 10–12G of memory and 1.5–1.9 CPU cores."
3939
kubespawner_override:
4040
mem_limit: "12G"

0 commit comments

Comments
 (0)