Merge pull request #5 from minrk/rm-onbuild

stop building onbuild

Author: manics

.github/workflows/build.yml

@@ -174,30 +174,6 @@ jobs:
           cache-from: ${{ env.CACHE_FROM }}
           cache-to: ${{ env.CACHE_TO }}
 
-      # image: env.IMAGE-onbuild
-      #
-      - name: Get list of jupyterhub-onbuild tags
-        id: onbuildtags
-        uses: jupyterhub/action-major-minor-tag-calculator@v3
-        with:
-          existingTags: ${{ needs.tag.outputs.existing-tags }}
-          newTag: ${{ needs.tag.outputs.new-tag }}
-          prefix: >-
-            ${{ env.REGISTRY }}${{ env.IMAGE }}-onbuild:
-            ${{ (env.PUBLIC == 'true' && env.PUBLISH_DOCKERIO == 'true') && format('{0}-onbuild:', env.IMAGE) || '' }}
-
-      - name: Build and push jupyterhub-onbuild
-        uses: docker/build-push-action@v6
-        with:
-          build-args: |
-            BASE_IMAGE=${{ fromJson(steps.jupyterhubtags.outputs.tags)[0] }}
-          context: onbuild
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ join(fromJson(steps.onbuildtags.outputs.tags)) }}
-          cache-from: ${{ env.CACHE_FROM }}
-          cache-to: ${{ env.CACHE_TO }}
-
       # image: env.IMAGE-demo
       #
       - name: Get list of jupyterhub-demo tags
@@ -214,7 +190,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           build-args: |
-            BASE_IMAGE=${{ fromJson(steps.onbuildtags.outputs.tags)[0] }}
+            BASE_IMAGE=${{ fromJson(steps.jupyterhubtags.outputs.tags)[0] }}
           context: demo-image
           platforms: linux/amd64,linux/arm64
           push: true

README.md

@@ -27,6 +27,34 @@ For example, see https://github.com/jupyterhub/jupyterhub-container-images/compa
 The following images are published by this repository:
 
 - [jupyterhub/jupyterhub](https://quay.io/repository/jupyterhub/jupyterhub?tab=tags)
-- [jupyterhub/jupyterhub-onbuild](https://quay.io/repository/jupyterhub/jupyterhub-onbuild?tab=tags)
 - [jupyterhub/jupyterhub-demo](https://quay.io/repository/jupyterhub/jupyterhub-demo?tab=tags)
 - [jupyterhub/singleuser](https://quay.io/repository/jupyterhub/singleuser?tab=tags)
+
+## Using these images
+
+The Hub images run jupyterhub in the `/srv/jupyterhub` directory.
+If you place your `jupyterhub_config.py` there,
+either by mounting `/srv/jupyterhub` as a volume, or adding
+
+```dockerfile
+COPY jupyterhub_config.py /srv/jupyterhub/jupyterhub_config.py
+```
+
+in your Dockerfile for your derived image.
+
+### jupyterhub-onbuild
+
+We no longer publish the `jupyterhub-onbuild` image,
+starting with jupyterhub 5.3.
+If you used `jupyterhub-onbuild` before,
+
+```dockerfile
+FROM quay.io/jupyterhub/jupyterhub-onbuild:5.2.1
+```
+
+can be replaced with
+
+```dockerfile
+FROM quay.io/jupyterhub/jupyterhub:5.2.1
+COPY jupyterhub_config.py /srv/jupyterhub/jupyterhub_config.py
+```

base/Dockerfile

@@ -15,11 +15,6 @@
 # Or you can create your jupyterhub config and database on the host machine, and mount it with:
 #
 # docker run -v $PWD:/srv/jupyterhub -t quay.io/jupyterhub/jupyterhub
-#
-# NOTE
-# If you base on quay.io/jupyterhub/jupyterhub-onbuild
-# your jupyterhub_config.py will be added automatically
-# from your docker directory.
 
 ARG BASE_IMAGE=ubuntu:22.04
 

demo-image/Dockerfile

@@ -3,7 +3,7 @@
 # This should only be used for demo or testing and not as a base image to build on.
 #
 # It includes the notebook package and it uses the DummyAuthenticator and the SimpleLocalProcessSpawner.
-ARG BASE_IMAGE=quay.io/jupyterhub/jupyterhub-onbuild
+ARG BASE_IMAGE=quay.io/jupyterhub/jupyterhub
 FROM ${BASE_IMAGE}
 
 # Install the notebook package
@@ -13,4 +13,8 @@ RUN python3 -m pip install notebook
 RUN useradd --create-home demo
 RUN chown demo .
 
+# Load jupyterhub config
+COPY jupyterhub_config.py /srv/jupyterhub/jupyterhub_config.py
+
+# Run as demo user
 USER demo