Refactor cwh_repo2docker_jupyterhub_config parameters

Author: shingo78

jupyterhub/cwh-repo2docker/cwh_repo2docker/__init__.py

@@ -172,6 +172,7 @@ def cwh_repo2docker_jupyterhub_config(
         config_file=None,
         service_name='environments',
         custom_menu=False,
+        service_environments={},
         debug=False):
     # hub
     c.JupyterHub.spawner_class = Repo2DockerSpawner
@@ -199,18 +200,6 @@ def cwh_repo2docker_jupyterhub_config(
             "--debug"
         ])
 
-    environ_names = [
-        'CONTAINER_IMAGE',
-        'REGISTRY_HOST',
-        'REGISTRY_USER',
-        'REGISTRY_PASSWORD'
-    ]
-
-    environments = {}
-    for name in environ_names:
-        if name in os.environ:
-            environments[name] = os.environ[name]
-
     c.JupyterHub.template_vars.update({
         'cwh_repo2docker_service_name': service_name
     })
@@ -221,6 +210,6 @@ def cwh_repo2docker_jupyterhub_config(
         "url": "http://127.0.0.1:10101",
         "display": not custom_menu,
         "oauth_no_confirm": True,
-        "environment": environments,
+        "environment": service_environments,
         "oauth_client_allowed_scopes": ["inherit"]
     }])

jupyterhub/jupyterhub_config.py

@@ -181,11 +181,24 @@ def resources(config):
 debug_log = os.environ.get('DEBUG', '0') in ['yes', '1']
 
 ## Configure cwh_repo2docker spawner and service
+cwh_repo2docker_environ_names = [
+    'CONTAINER_IMAGE',
+    'REGISTRY_HOST',
+    'REGISTRY_USER',
+    'REGISTRY_PASSWORD'
+]
+
+service_environments = {}
+for name in cwh_repo2docker_environ_names:
+    if name in os.environ:
+        service_environments[name] = os.environ[name]
+
 cwh_repo2docker_config_path = '/srv/jupyterhub/cwh_repo2docker_config.py'
 cwh_repo2docker_jupyterhub_config(
     c,
     config_file=cwh_repo2docker_config_path,
     custom_menu=True,
+    service_environments=service_environments,
     debug=debug_log)
 load_subconfig(cwh_repo2docker_config_path)