Merge pull request #45 from shingo78/feature/jupyterhub-5.2

Upgrade JuyterHub to 5.2

Author: shingo78

jupyterhub/Dockerfile

@@ -1,4 +1,4 @@
-FROM jupyterhub/jupyterhub:4.0 AS builder
+FROM jupyterhub/jupyterhub:5.2 AS builder
 
 # dev tools
 RUN apt-get update && \
@@ -43,7 +43,7 @@ RUN python3 -m pip wheel --wheel-dir wheelhouse --constraint requirements \
 RUN python3 -m pip wheel --wheel-dir wheelhouse --constraint requirements \
     jupyterhub-idle-culler
 
-FROM jupyterhub/jupyterhub:4.0
+FROM jupyterhub/jupyterhub:5.2
 
 # dind
 RUN apt-get update && \
@@ -58,8 +58,8 @@ RUN apt-get update && \
     apt-get autoclean && apt-get clean && apt-get autoremove
 
 # install the wheels from first stage
-COPY --from=builder /tmp/wheelhouse /tmp/wheelhouse
-RUN python3 -m pip install --no-cache --no-deps /tmp/wheelhouse/*
+RUN --mount=type=cache,from=builder,source=/tmp/wheelhouse,target=/tmp/wheelhouse \
+    python3 -m pip install --no-cache --no-deps /tmp/wheelhouse/*
 
 # Resources
 RUN mkdir /var/jupyterhub

jupyterhub/cwh-repo2docker/cwh_repo2docker/__init__.py

@@ -148,7 +148,8 @@ async def _get_cmd_from_image(self):
     async def get_command(self):
         image_cmd = await self._get_cmd_from_image()
         # override cmd for docker-stacks image
-        if image_cmd == ['start-notebook.sh']:
+        if (image_cmd == ['start-notebook.sh']
+                or image_cmd == ['start-notebook.py']):
             return image_cmd + self.get_args()
 
         if self.cmd:

jupyterhub/cwh-repo2docker/cwh_repo2docker/custom_templates/page.html

@@ -3,6 +3,6 @@
 {% block nav_bar_left_items %}
 {{ super() }}
 {% if 'access:services!service={{cwh_repo2docker_service_name}}' in expanded_scopes or 'access:services' in expanded_scopes %}
-<li><a href="{{prefix}}services/{{cwh_repo2docker_service_name}}/">Environments</a></li>
+<li class="nav-item"><a class="nav-link" href="{{prefix}}services/{{cwh_repo2docker_service_name}}/">Environments</a></li>
 {% endif %}
 {% endblock %}

jupyterhub/cwh-repo2docker/cwh_repo2docker/static/js/images.js

@@ -1,10 +1,9 @@
 require([
-  "jquery", "bootstrap", "moment", "jhapi", "utils",
+  "jquery", "moment", "jhapi", "utils",
   "static/vendor/xterm-addon-fit.js",
   "static/vendor/xterm.js"
 ], function(
   $,
-  bs,
   moment,
   JHAPI,
   utils,
@@ -39,7 +38,8 @@ require([
     dialog.find(".build-args-input").val("");
     dialog.find(".username-input").val("");
     dialog.find(".password-input").val("");
-    dialog.modal();
+    var modal = new bootstrap.Modal(dialog[0])
+    modal.show();
   });
 
   $(".set-default-course-image").click(function() {
@@ -71,7 +71,8 @@ require([
       var password = dialog.find(".password-input").val().trim();
       var spinner = $("#adding-environment-dialog");
       spinner.find('.modal-footer').remove();
-      spinner.modal();
+      var modal = new bootstrap.Modal(spinner[0])
+      modal.show();
       $.ajax("api/environments?_xsrf=" + xsrf_token, {
         type: "POST",
         data: JSON.stringify({
@@ -96,7 +97,8 @@ require([
     var dialog = $("#remove-environment-dialog");
     dialog.find(".delete-environment").attr("data-image", image);
     dialog.find(".delete-environment").text(name);
-    dialog.modal();
+    var modal = new bootstrap.Modal(dialog[0])
+    modal.show();
   });
 
   $("#remove-environment-dialog")
@@ -106,7 +108,8 @@ require([
       var image = dialog.find(".delete-environment").data("image");
       var spinner = $("#removing-environment-dialog");
       spinner.find('.modal-footer').remove();
-      spinner.modal();
+      var modal = new bootstrap.Modal(spinner[0])
+      modal.show();
       $.ajax("api/environments?_xsrf=" + xsrf_token, {
         type: "DELETE",
         data: JSON.stringify({
@@ -124,6 +127,8 @@ require([
     var image = row.data("image");
     var dialog = $("#show-logs-dialog");
 
+    dialog.find(".modal-dialog").addClass("modal-lg");
+
     var log = new xterm.Terminal({
       convertEol: true,
       disableStdin: true
@@ -165,7 +170,8 @@ require([
         eventSource.close();
       }
     });
-    dialog.modal();
+    var modal = new bootstrap.Modal(dialog[0])
+    modal.show();
   });
 
   // initialize tooltips

jupyterhub/cwh-repo2docker/cwh_repo2docker/templates/images.html

@@ -109,20 +109,20 @@
 {% call modal(name, btn_class='btn-primary save-button') %}
   <div class="form-horizontal">
     <div class="form-group">
-      <label for="repository-url" class="col-sm-4 control-label">Repository URL</label>
-      <div class="col-sm-8">
+      <label for="repository-url" class="col-sm-6 control-label">Repository URL</label>
+      <div class="col-sm-10">
         <input type="text" class="form-control repo-input" id="repository-url"/>
       </div>
     </div>
     <div class="form-group">
-      <label for="reference" class="col-sm-4 control-label">Reference (git commit)</label>
-      <div class="col-sm-8">
+      <label for="reference" class="col-sm-6 control-label">Reference (git commit)</label>
+      <div class="col-sm-10">
         <input type="text" class="form-control ref-input" id="reference" placeholder="HEAD"/>
       </div>
     </div>
     <div class="form-group">
-      <label for="name" class="col-sm-4 control-label">Name of the environment</label>
-      <div class="col-sm-8">
+      <label for="name" class="col-sm-6 control-label">Name of the environment</label>
+      <div class="col-sm-10">
         <input data-toggle="tooltip" title="Allowed characters are a to z, A to Z, 0 to 9, - and _"
                type="text" class="form-control name-input" id="name"/>
         <p class="help-block">Example: course-python-101-B37</p>
@@ -132,23 +132,23 @@
     <details>
       <summary>&gt; Advanced</summary>
       <div class="form-group">
-        <label for="build-args" class="col-sm-4 control-label">Build Arguments</label>
-        <div class="col-sm-8">
+        <label for="build-args" class="col-sm-6 control-label">Build Arguments</label>
+        <div class="col-sm-10">
           <textarea class="form-control build-args-input" id="build-args" rows="4" placeholder="arg1=val1&#10;arg2=val2&#10;..."></textarea>
         </div>
       </div>
     </details>
     <details>
       <summary>&gt; Credentials (optional)</summary>
       <div class="form-group">
-        <label for="username" class="col-sm-4 control-label">Git Username</label>
-        <div class="col-sm-8">
+        <label for="username" class="col-sm-6 control-label">Git Username</label>
+        <div class="col-sm-10">
           <input type="text" class="form-control username-input" id="username"/>
         </div>
       </div>
       <div class="form-group">
-        <label for="password" class="col-sm-4 control-label">Git Password</label>
-        <div class="col-sm-8">
+        <label for="password" class="col-sm-6 control-label">Git Password</label>
+        <div class="col-sm-10">
           <input type="password" class="form-control password-input" id="password"/>
         </div>
       </div>

jupyterhub/cwh-repo2docker/cwh_repo2docker/templates/page.html

@@ -1,22 +1,18 @@
 {% extends "templates/page.html" %}
 
-{% block nav_bar %}
-  <nav class="navbar navbar-default">
-    <div class="container-fluid">
-      <div class="navbar-header">
-        <span id="jupyterhub-logo" class="pull-left">
-            <a href="{{logo_url or base_url}}"><img src='{{base_url}}logo' alt='JupyterHub logo' class='jpy-logo' title='Home'/></a>
-        </span>
-        <span class="navbar-brand">{{ brand_text }}</span>
-      </div>
-      <div class="collapse navbar-collapse" id="thenavbar">
-        <ul class="nav navbar-nav">
-            <li><a href="{{base_url}}home">Home</a></li>
-        </ul>
-      </div>
-    </div>
-  </nav>
-{% endblock %}
+{% block logo %}
+    {{ super() }}
+    <span class="navbar-brand">{{ brand_text }}</span>
+{% endblock logo %}
+
+{% block nav_bar_left_items %}
+    <li class="nav-item">
+        <a class="nav-link" href="{{ base_url }}home">Home</a>
+    </li>
+{% endblock nav_bar_left_items %}
+
+{% block login_widget %}
+{% endblock login_widget %}
 
 {% block announcement %}
 {% endblock %}

jupyterhub/cwh-repo2docker/setup.py

@@ -11,7 +11,7 @@
     include_package_data = True,
     install_requires     = [
         "coursewareuserspawner",
-        "jupyterhub~=4.0",
+        "jupyterhub~=5.0",
         "aiodocker",
         'aiohttp']
 )

jupyterhub/spawner/coursewareuserspawner/__init__.py

@@ -343,6 +343,10 @@ def get_env(self):
             NB_UID=self.user_id,
             HOME=self.homedir,
         ))
+        if os.environ('DEBUG', 'no') in ['yes', '1']:
+            env.update(dict(
+                REPO_DIR=self.homedir,
+            ))
         # Fix 20180802
         if self._is_admin():
             env['GRANT_SUDO'] = 'yes'

jupyterhub/spawner/setup.py

@@ -41,7 +41,7 @@ def run(self):
     long_description    = "Spawn single-user servers with Docker.",
     platforms           = "Linux, Mac OS X",
     install_requires    = [
-        'requests-unixsocket @ git+https://github.com/NII-cloud-operation/requests-unixsocket.git',
+        'requests-unixsocket',
         'dockerspawner'
     ],
     cmdclass = {