Cleanup some code

Author: mathbunnyru

.github/workflows/test.yml

@@ -1,5 +1,5 @@
 # This is a GitHub workflow defining a set of jobs with a set of steps.
-# ref: https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions
+# ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
 #
 name: Tests
 
@@ -15,14 +15,15 @@ jobs:
   # https://github.com/pre-commit/action
   pre-commit:
     name: Lint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
       - uses: pre-commit/action@v3.0.0
 
   # Run tests
   test:
+    name: Test
     runs-on: ubuntu-22.04
     timeout-minutes: 10
     strategy:
@@ -47,11 +48,9 @@ jobs:
         run: cat ci/config_token.py >> ${{ matrix.example }}/jupyterhub_config.py
 
       - name: Run JupyterHub
-        run: |
-          cd ${{ matrix.example }}
-          docker-compose up -d
+        working-directory: ${{ matrix.example }}
+        run: docker-compose up --detach
 
       - name: Test
-        run: |
-          cd ${{ matrix.example }}
-          pytest -vs
+        working-directory: ${{ matrix.example }}
+        run: pytest --verbose --capture=no

basic-example/Dockerfile.jupyterhub

@@ -4,9 +4,9 @@ ARG JUPYTERHUB_VERSION
 FROM jupyterhub/jupyterhub:$JUPYTERHUB_VERSION
 
 # Install dockerspawner, nativeauthenticator
+# hadolint ignore=DL3013
 RUN python3 -m pip install --no-cache-dir \
-        dockerspawner==12.* \
-        jupyterhub-nativeauthenticator==1.*
+    dockerspawner \
+    jupyterhub-nativeauthenticator
 
-COPY ./jupyterhub_config.py /srv/jupyterhub/jupyterhub_config.py
 CMD ["jupyterhub", "-f", "/srv/jupyterhub/jupyterhub_config.py"]

basic-example/docker-compose.yml

@@ -32,13 +32,11 @@ services:
       # All containers will join this network
       DOCKER_NETWORK_NAME: jupyterhub-network
       # JupyterHub will spawn this Notebook image for users
-      DOCKER_NOTEBOOK_IMAGE: jupyter/minimal-notebook:latest
+      DOCKER_NOTEBOOK_IMAGE: jupyter/base-notebook:latest
       # Notebook directory inside user image
       DOCKER_NOTEBOOK_DIR: /home/jovyan/work
       # Using this run command
       DOCKER_SPAWN_CMD: start-singleuser.sh
-    command: >
-      jupyterhub -f /srv/jupyterhub/jupyterhub_config.py
 
 volumes:
   jupyterhub-data:

basic-example/jupyterhub_config.py

@@ -30,10 +30,10 @@
 c.DockerSpawner.network_name = network_name
 
 # Explicitly set notebook directory because we'll be mounting a volume to it.
-# Most jupyter/docker-stacks *-notebook images run the Notebook server as
+# Most `jupyter/docker-stacks` *-notebook images run the Notebook server as
 # user `jovyan`, and set the notebook directory to `/home/jovyan/work`.
 # We follow the same convention.
-notebook_dir = os.environ.get("DOCKER_NOTEBOOK_DIR") or "/home/jovyan/work"
+notebook_dir = os.environ.get("DOCKER_NOTEBOOK_DIR", "/home/jovyan/work")
 c.DockerSpawner.notebook_dir = notebook_dir
 
 # Mount the real user's Docker volume on the host to the notebook user's

ci/check_hub.sh

@@ -13,6 +13,7 @@ while [ $count -lt 60 ]; do
     printf .
     count=$((count+1))
 done
+
 if [ $started -eq 0 ]; then
     echo "*****"
     echo "JupyterHub did not start"