Merge branch 'update-handbook-image' of https://github.com/jnywong/co…

…mmunity-showcase into update-handbook-image

.github/workflows/build-images.yaml

@@ -85,7 +85,7 @@ jobs:
           DOCKER_REGISTRY: "quay.io"
 
           # Disable pushing a 'latest' tag, as this often just causes confusion
-          LATEST_TAG_OFF: true
+          LATEST_TAG_OFF: false
 
           # NOTE: This line assumes that the subfolder that contains the image has
           #       the same name as the image when it is pushed to the registry. We

README.md

@@ -1,5 +1,9 @@
 # 2i2c Community Showcase
 
+> [!NOTE]
+> This is not currently in use as we decide what kind of content should go here.
+> Instead, look at [the `docs/` repository](https://github.com/2i2c-org/docs) for learning and training content.
+
 This repo manages the images behind https://showcase.2i2c.cloud and supports Community of 2i2c Hub Champions using 2i2c infrastructure.
 
 ## About this repository :information_source:

images/dacapo-image/Dockerfile

@@ -1,5 +1,5 @@
 # Inherit from an upstream image
-FROM jupyter/scipy-notebook:2023-05-01
+FROM quay.io/jupyter/pytorch-notebook:2024-04-19
 
 COPY environment.yml /tmp/environment.yml
 

images/dacapo-image/environment.yml

@@ -3,6 +3,8 @@ channels:
 
 dependencies:
   - nbgitpuller
+  - jupyter-server-proxy
+  - pip
 
   - pip:
     - git+https://github.com/janelia-cellmap/dacapo

images/researchdelight-image/Dockerfile

@@ -0,0 +1,20 @@
+FROM quay.io/jupyter/scipy-notebook
+
+USER root
+
+RUN apt-get -qq update && \
+    apt-get -qq install --yes --no-install-recommends \
+       gettext-base \
+       less \
+       unzip \
+       > /dev/null && \
+    apt-get -qq purge && \
+    apt-get -qq clean && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install from the environment.yml file
+COPY --chown=${NB_UID}:${NB_GID} environment.yml /tmp/
+RUN mamba env update -n base --file /tmp/environment.yml && \
+    mamba clean --all -f -y && \
+    fix-permissions "${CONDA_DIR}" && \
+    fix-permissions "/home/${NB_USER}"

images/researchdelight-image/README.md

@@ -1 +1,3 @@
-A first attempt at building a user environment. Currently broken.
+This image is for internal 2i2c use for exploration of the open science ecosystem.
+
+It is a customization of the Jupyter Docker Stack [jupyter/scipy-notebook](https://jupyter-docker-stacks.readthedocs.io/en/latest/using/selecting.html#jupyter-scipy-notebook).

images/researchdelight-image/environment.yml

@@ -1,20 +1,9 @@
-name: researchdelight
-
 channels:
   - conda-forge
-
 dependencies:
-  - python=3.10
   - jupyter_contrib_nbextensions==0.5.1
-  # Required until https://github.com/jupyterhub/repo2docker/pull/1196 is merged
-  - jupyterhub-singleuser>=3.0,<4.0
-  # Required until https://github.com/jupyterhub/repo2docker/pull/1196 is merged
-  - jupyterhub-singleuser>=3.0,<4.0
   # nbgitpuller is very helpful when distributing user content
   - nbgitpuller
-  # Specify major version of jupyterlab to use. Manually bump it when you want to upgrade
-  # jupyterlab version
-  - jupyterlab>=3.0,<4.0
   # This provides memory usage stats on JupyterLab and classic notebook
   - jupyter-resource-usage
   # https://syncthing.net/ provides a dropbox-like interface for syncing directories across users,
@@ -24,6 +13,10 @@ dependencies:
   # https://blog.jupyter.org/securely-pushing-to-github-from-a-jupyterhub-3ee42dfdc54f has
   # some more information
   - gh-scoped-creds
+  # https://jupyter-ai.readthedocs.io/en/latest/
+  - jupyter-ai
+  - langchain-openai
+  - flake8
 
   # Cloud access tools and libraries
   # Access S3 easily from python
@@ -34,22 +27,11 @@ dependencies:
   # Access datasets exposed via STAC
   - pystac-client
 
-  # Visualization packages
-  - matplotlib
-  - ipympl # This enables matplotlib interaction with jupyter widgets
-  - ipyleaflet
-
-  # Geospatial data packages
-  - rasterio
-  - rioxarray
-  - xarray-datatree
-
-  # needed for Linux desktop to work
-  - websockify>=0.10
-
   # Not all packages will be available from conda-forge, we install from pip when we need to.
   - pip
   - pip:
       - jupyter-syncthing-proxy
       # Access linux desktop from inside JupyterHub
       - jupyter-desktop-server
+      # enable myst
+      - jupyterlab_myst