Merge pull request #1635 from minrk/jupyter-server

switch default server to jupyter-server-based jupyter-lab
jupyterhub · Feb 28, 2023 · 9641ab8 · 9641ab8
2 parents 44bc72b + 2f7189e
commit 9641ab8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/binderhub/binderspawner_mixin.py b/binderhub/binderspawner_mixin.py
@@ -84,6 +84,10 @@ def get_args(self):
             if self.cors_allow_origin == "*":
                 args.append("--NotebookApp.allow_origin_pat=.*")
             args += self.args
+            # ServerApp compatibility: duplicate NotebookApp args
+            for arg in list(args):
+                if arg.startswith("--NotebookApp."):
+                    args.append(arg.replace("--NotebookApp.", "--ServerApp."))
         return args
 
     def start(self):

diff --git a/helm-chart/binderhub/values.yaml b/helm-chart/binderhub/values.yaml
@@ -169,6 +169,10 @@ jupyterhub:
                     if self.cors_allow_origin == "*":
                         args.append("--NotebookApp.allow_origin_pat=.*")
                     args += self.args
+                    # ServerApp compatibility: duplicate NotebookApp args
+                    for arg in list(args):
+                        if arg.startswith("--NotebookApp."):
+                            args.append(arg.replace("--NotebookApp.", "--ServerApp."))
                 return args
 
             def start(self):
@@ -224,12 +228,14 @@ jupyterhub:
         else:
             have_lab = major >= 3
 
-        if have_lab and "NotebookApp.default_url" not in " ".join(sys.argv):
-            # if recent-enough lab is available, make it the default UI
-            sys.argv.insert(1, "--NotebookApp.default_url=/lab/")
+        if have_lab:
+          # technically, we could accept another jupyter-server-based frontend
+          exe = "jupyter-lab"
+        else:
+          exe = "jupyter-notebook"
 
         # launch the notebook server
-        os.execvp("jupyter-notebook", sys.argv)
+        os.execvp(exe, sys.argv)
     events: true
     storage:
       type: none