minor fixes

everware · 46a8ac78a5bc0dd06a7ba893c414f97c175b3e02 · StrausMG committed Jun 24, 2017 · Jun 24, 2017 · 46a8ac7
1 parent bb8ae87
commit 46a8ac78a5bc0dd06a7ba893c414f97c175b3e02
Unified Split

Showing with 3 additions and 4 deletions.

+1 −2 etc/byor_config.py

+1 −1 everware/spawner.py

+1 −1 share/static/html/_byor_options_form.html
diff --git a/etc/byor_config.py b/etc/byor_config.py
@@ -2,5 +2,4 @@
 load_subconfig('etc/base_config.py')
 load_subconfig('etc/github_auth.py')
 
-from dockerspawner import DockerSpawner
+c.JupyterHub.spawner_class = 'everware.ByorDockerSpawner'
-c.DockerSpawner.hub_ip_connect = c.JupyterHub.hub_ip
diff --git a/everware/spawner.py b/everware/spawner.py
@@ -365,7 +365,7 @@ def remove_old_container(self):
                 force=True
             )
         except APIError as e:
-            self.log.info("Can't erase container %s due to %s" % (self.container_name, e)) 
+            self.log.info("Can't erase container %s due to %s" % (self.container_name, e))
 
     @gen.coroutine
     def start(self, image=None):
diff --git a/share/static/html/_byor_options_form.html b/share/static/html/_byor_options_form.html
@@ -50,7 +50,7 @@
 <p style="margin-bottom: 0px;">
     For a successful run <a href="https://www.docker.com/" target="_black">Docker</a>
     must be installed on your server.<br />
-    Enter ip and port of the Docker daemon running on your server.<br />
+    Enter IP address and port of the Docker daemon running on your server.<br />
     (Click <a href="https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-socket-option"
             target="_blank">
     here</a> to learn how to run Docker daemon on a particular port)