Merge remote-tracking branch 'upstream/main' into closure

jupyterhub · Aug 2, 2024 · c65214d · c65214d
2 parents 7c55383 + a8a2e19
commit c65214d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/helm-chart/binderhub/values.yaml b/helm-chart/binderhub/values.yaml
@@ -280,7 +280,7 @@ dind:
   daemonset:
     image:
       name: docker.io/library/docker
-      tag: "27.0.2-dind" # ref: https://hub.docker.com/_/docker/tags
+      tag: "27.1.1-dind" # ref: https://hub.docker.com/_/docker/tags
       pullPolicy: ""
       pullSecrets: []
     # Additional command line arguments to pass to dockerd
@@ -300,7 +300,7 @@ pink:
   daemonset:
     image:
       name: quay.io/podman/stable
-      tag: "v5.1.1" # ref: https://quay.io/repository/podman/stable
+      tag: "v5.1.2" # ref: https://quay.io/repository/podman/stable
       pullPolicy: ""
       pullSecrets: []
     lifecycle: {}

diff --git a/testing/local-binder-local-hub/jupyterhub_config.py b/testing/local-binder-local-hub/jupyterhub_config.py
@@ -26,14 +26,15 @@ class LocalContainerSpawner(BinderSpawnerMixin, DockerSpawner):
 c.JupyterHub.spawner_class = LocalContainerSpawner
 c.DockerSpawner.remove = True
 c.DockerSpawner.allowed_images = "*"
-c.LocalContainerSpawner.cmd = "jupyter-notebook"
 
 c.Application.log_level = "DEBUG"
 c.Spawner.debug = True
 c.JupyterHub.authenticator_class = os.getenv("AUTHENTICATOR", "null")
 
 auth_enabled = c.JupyterHub.authenticator_class != "null"
 if auth_enabled:
+    c.LocalContainerSpawner.auth_enabled = True
+    c.LocalContainerSpawner.cmd = "jupyterhub-singleuser"
     c.JupyterHub.load_roles = [
         {
             "name": "user",
@@ -44,6 +45,8 @@ class LocalContainerSpawner(BinderSpawnerMixin, DockerSpawner):
             ],
         }
     ]
+else:
+    c.LocalContainerSpawner.cmd = "jupyter-notebook"
 
 c.JupyterHub.hub_ip = "0.0.0.0"
 c.JupyterHub.hub_connect_ip = hostip