Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update image and packages for 2025 #3643

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Update image and packages for 2025 #3643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53840a7
feat(jupyter-singleuser): Update image and packages for 2025
Jan 13, 2025
b6a5320
feat(jupyterhub): deploy the next image to the testing slot
Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions images/jupyter-singleuser/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM jupyter/datascience-notebook:python-3.11.6

LABEL org.opencontainers.image.source https://github.com/cal-itp/data-infra
LABEL org.opencontainers.image.source=https://github.com/cal-itp/data-infra

USER root
RUN apt-get update
Expand All @@ -15,8 +15,7 @@ RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | s
RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null
RUN apt update \
&& apt install -y gh


RUN apt-get install -y gdal-bin libgdal-dev # for rasterio
# create these ahead of time, then chown to to the notebook user
ENV GCLOUD_HOME=/gcloud
ENV POETRY_HOME="/poetry"
Expand All @@ -29,9 +28,10 @@ USER $NB_UID

RUN curl -sSL https://install.python-poetry.org | python3 -
ENV PATH="$POETRY_HOME/bin:$PATH"

RUN npm install -g --unsafe-perm=true --allow-root netlify-cli vega-cli vega-lite sql-language-server

RUN npm install -g --unsafe-perm=true --allow-root netlify-cli
# RUN npm install -g --unsafe-perm=true --allow-root vega-cli # Can't get these to work
# RUN npm install -g --unsafe-perm=true --allow-root vega-lite
RUN npm install -g --unsafe-perm=true --allow-root sql-language-server
# gcloud CLI https://cloud.google.com/sdk/docs/install#deb
RUN cd $GCLOUD_HOME \
&& curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-423.0.0-linux-x86_64.tar.gz \
Expand All @@ -42,7 +42,9 @@ ENV PATH="$GCLOUD_HOME/google-cloud-sdk/bin:$PATH"
COPY ./pyproject.toml /reqs/pyproject.toml
COPY ./poetry.lock /reqs/poetry.lock
RUN poetry config virtualenvs.create false
# RUN gdalinfo --version # for debugging, use this to figure out which rasterio to support
RUN cd /reqs && poetry install --with=shared_utils --with=portfolio
RUN cd /reqs && poetry show # print out the package versions for documentation
RUN poetry config virtualenvs.create true

ENV DBT_PROFILES_DIR=/home/jovyan/.dbt/
Expand Down
14 changes: 14 additions & 0 deletions images/jupyter-singleuser/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,24 @@ via JupyterHub.

A person with Docker set up locally can build a new version of the image at any time after making changes.

This can check for any significant security issues with this build
```
pip install safety
safety scan
```
Take the package versions from the build file and document with the PR. Do a cleanup step before you make a final build.

```
docker system prune -a #
docker build . 2>&1 | tee build.log
```


```bash
docker build -t ghcr.io/cal-itp/data-infra/jupyter-singleuser:[NEW VERSION TAG] .
```


## Deploying Changes to Production

When changes are finalized, a new version number should be specified in [pyproject.toml](./pyproject.toml). When changes to this directory are merged into `main`, [a GitHub Action](../../.github/workflows/build-jupyter-singleuser-image.yml) automatically publishes an updated version of the image. A contributor with proper GHCR permissions can also manually deploy a new version of the image via the CLI:
Expand Down
Loading
Loading