Merge pull request #2 from csdms/mdpiper/allow-multiple-images

Allow multiple images

Author: mdpiper

.github/workflows/release.yml

@@ -34,5 +34,6 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
+          context: images/base
           push: true
           tags: ${{ env.REPO }}:latest,${{ env.REPO }}:${{ steps.vars.outputs.version }}

Dockerfile

@@ -4,16 +4,16 @@
 
 # jupyterhub-docker
 
-A Docker image for a JupyterHub
-based on the [scipy-notebook][scipy-notebook] image
+Docker images for JupyterHubs
+based on the Project Jupyter [scipy-notebook][scipy-notebook] image
 with [CSDMS Workbench][csdms-workbench] software
 (Landlab, Basic Model Interface, Data Components) pre-installed.
 
 ## Build an image
 
-Build an image locally with:
+Build the base image locally with:
 ```sh
-docker build --tag csdms/jupyterhub .
+docker build --tag jupyterhub-base images/base
 ```
 The OS is Linux/Ubuntu.
 `conda` and `mamba`, as well as CSDMS Workbench software, are installed in `CONDA_DIR=/opt/conda`.
@@ -23,7 +23,7 @@ The *base* environment is activated.
 
 Run a container from this image:
 ```sh
-docker run -p 8888:8888 csdms/jupyterhub
+docker run -p 8888:8888 --rm jupyterhub-base
 ```
 This starts a JupyterHub.
 Visiting `http://<hostname>:8888/?token=<token>` in a browser loads JupyterLab, where:
@@ -39,11 +39,11 @@ This image is automatically built and pushed to Docker Hub
 with the [release](./.github/workflows/release.yml) CI workflow.
 The workflow is only run when the repository is tagged.
 To manually build and push an update, run:
-```
-docker buildx build --platform linux/amd64,linux/arm64 -t csdms/jupyterhub:latest --push .
+```sh
+docker buildx build --platform linux/amd64,linux/arm64 -t csdms/jupyterhub:latest --push images/base
 ```
 A user can pull this image from Docker Hub with:
-```
+```sh
 docker pull csdms/jupyterhub
 ```
 optionally with the `latest` tag or with a version tag.

README.md

@@ -0,0 +1,26 @@
+# Set up a JupyterHub that includes all CSDMS Workbench software.
+FROM quay.io/jupyter/scipy-notebook:python-3.13.5
+
+LABEL org.opencontainers.image.authors="Mark Piper <[email protected]>"
+LABEL org.opencontainers.image.url="https://hub.docker.com/r/csdms/jupyterhub"
+LABEL org.opencontainers.image.source="https://github.com/csdms/jupyterhub-docker"
+LABEL org.opencontainers.image.vendor="CSDMS"
+
+USER root
+RUN apt-get update --yes && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+USER ${NB_UID}
+
+# GDAL pip install failed on arm64. Use a conda binary instead.
+RUN mamba install -y gdal && \
+    mamba clean --all -f -y
+
+COPY --chown=${NB_UID}:${NB_GID} requirements.in /tmp/
+RUN pip install --no-cache-dir -r /tmp/requirements.in
+
+# Get the Landlab repo for the notebooks.
+RUN git clone --depth 1 --branch v2.10.1 https://github.com/landlab/landlab && \
+    rm -rf ./landlab/.git
+
+WORKDIR "${HOME}"

images/base/Dockerfile

@@ -0,0 +1,13 @@
+<!-- Links -->
+[scipy-notebook]: https://jupyter-docker-stacks.readthedocs.io/en/latest/using/selecting.html#jupyter-scipy-notebook
+[csdms-workbench]: https://csdms.colorado.edu/wiki/Workbench
+
+# base
+
+This is the base image for the CSDMS JupyterHub.
+It is built on the Project Jupyter [scipy-notebook][scipy-notebook] image
+with [CSDMS Workbench][csdms-workbench] software
+(Landlab, Basic Model Interface, Data Components) pre-installed.
+
+For more information on using this image,
+see the top-level [README](../../README.md) in this repository.

images/base/README.md

@@ -0,0 +1,11 @@
+# CSDMS JupyterHub Helm chart configuration
+
+hub:
+  db:
+    type: sqlite-memory
+
+singleuser:
+  image:
+    name: csdms/jupyterhub
+    tag: 0.2.0
+  cmd: null

images/base/config.yaml

@@ -0,0 +1,3 @@
+bmi-topography
+bmi-geotiff
+landlab