From fa4909aa1919ad7652f8a9c6883f6d49da5ca1b4 Mon Sep 17 00:00:00 2001 From: Viktor Gal Date: Tue, 14 Mar 2017 19:45:20 +0800 Subject: [PATCH] normalize the jupyterhub environment variable names --- docker/jupyterhub/jupyterhub_config.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/jupyterhub/jupyterhub_config.py b/docker/jupyterhub/jupyterhub_config.py index f627eea..6f718f1 100644 --- a/docker/jupyterhub/jupyterhub_config.py +++ b/docker/jupyterhub/jupyterhub_config.py @@ -20,12 +20,13 @@ c.MarathonSpawner.marathon_host = os.environ.get('MARATHON_MASTER') c.MarathonSpawner.marathon_constraints = os.getenv('MARATHON_CONSTRAINTS', []) c.MarathonSpawner.notebook_dir = os.environ.get('DOCKER_NOTEBOOK_DIR') or '/home/jovyan/work' -c.MarathonSpawner.hub_ip_connect = os.environ.get('HUB_IP_CONNECT') -c.MarathonSpawner.hub_port_connect = int(os.environ.get('HUB_PORT_CONNECT')) +c.MarathonSpawner.hub_ip_connect = os.environ.get('JUPYTERHUB_IP_CONNECT') +c.MarathonSpawner.hub_port_connect = int(os.environ.get('JUPYTERHUB_PORT_CONNECT')) c.MarathonSpawner.mem_limit = os.getenv('NOTEBOOK_MEMORY_LIMIT', '2G') c.MarathonSpawner.cpu_limit = float(os.getenv('NOTEBOOK_CPU_LIMIT', 2.0)) -c.MarathonSpawner.start_timeout = int(os.getenv('JPY_START_TIMEOUT', '60')) -c.MarathonSpawner.http_timeout = int(os.getenv('JPY_HTTP_TIMEOUT', '60')) +c.MarathonSpawner.start_timeout = int(os.getenv('JUPYTERHUB_START_TIMEOUT', '60')) +c.MarathonSpawner.http_timeout = int(os.getenv('JUPYTERHUB_HTTP_TIMEOUT', '60')) +c.MarathonSpawner.poll_interval = int(os.getenv('JUPYTERHUB_POLL_INTERVAL', '30')) def volumes(env_var):