You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2019/05/20 14:13:51 UTC
[incubator-dlab] 01/02: Revert "[DLAB-623] Demo-version(bugfix)"
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-433
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 80e37c41518f621484f9699bb36d6f7065bd06b3
Author: Dyoma33 <de...@gmail.com>
AuthorDate: Mon May 20 17:13:20 2019 +0300
Revert "[DLAB-623] Demo-version(bugfix)"
This reverts commit d1d37a9e17f6dc7c078f58c9c04a628e2c7701b0.
---
.../src/general/lib/os/fab.py | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 79f4435..b4b2a73 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -228,14 +228,14 @@ def ensure_jupyter_docker_files(os_user, legion_dir, templates_dir, jupyter_dir,
# sudo('mkdir {}'.format(jupyter_dir))
# put(templates_dir + 'pyspark_local_template.json', '/tmp/pyspark_local_template.json')
# put(templates_dir + 'py3spark_local_template.json', '/tmp/py3spark_local_template.json')
- put('/root/Dockerfile_jupyter', '/tmp/Dockerfile_jupyter')
- put('/root/jupyter_run.sh', '/tmp/jupyter_run.sh')
+ put('/root/Dockerfile_jupyter', '/tmp/Dockerfile_jupyter')
+ put('/root/jupyter_run.sh', '/tmp/jupyter_run.sh')
# sudo('\cp /tmp/pyspark_local_template.json ' + jupyter_dir + 'pyspark_local_template.json')
# sudo('\cp /tmp/py3spark_local_template.json ' + jupyter_dir + 'py3spark_local_template.json')
# sudo('sed -i \'s/3.5/3.6/g\' {}py3spark_local_template.json'.format(jupyter_dir))
- sudo('mv /tmp/jupyter_run.sh /home/' + os_user + '/legion/containers/toolchains/python/jupyter_run.sh')
- sudo('mv /tmp/Dockerfile_jupyter /home/' + os_user + '/legion/containers/toolchains/python/Dockerfile')
- sudo('sed -i \'s/nb_user/{}/g\' /home/' + os_user + '/legion/containers/toolchains/python/Dockerfile'.format(os_user))
+ sudo('mv /tmp/jupyter_run.sh /home/' + os_user + '/legion/containers/toolchains/python/jupyter_run.sh')
+ sudo('mv /tmp/Dockerfile_jupyter /home/' + os_user + '/legion/containers/toolchains/python/Dockerfile')
+ sudo('sed -i \'s/nb_user/{}/g\' /home/' + os_user + '/legion/containers/toolchains/python/Dockerfile'.format(os_user))
# sudo('sed -i \'s/jup_version/{}/g\' {}Dockerfile_jupyter'.format(jupyter_version, jupyter_dir))
# sudo('sed -i \'s/hadoop_version/{}/g\' {}Dockerfile_jupyter'.format(os.environ['notebook_hadoop_version'], jupyter_dir))
# sudo('sed -i \'s/tornado_version/{}/g\' {}Dockerfile_jupyter'.format(os.environ['notebook_tornado_version'], jupyter_dir))
@@ -243,14 +243,14 @@ def ensure_jupyter_docker_files(os_user, legion_dir, templates_dir, jupyter_dir,
# sudo('sed -i \'s/numpy_version/{}/g\' {}Dockerfile_jupyter'.format(os.environ['notebook_numpy_version'], jupyter_dir))
# sudo('sed -i \'s/spark_version/{}/g\' {}Dockerfile_jupyter'.format(os.environ['notebook_spark_version'], jupyter_dir))
# sudo('sed -i \'s/scala_version/{}/g\' {}Dockerfile_jupyter'.format(os.environ['notebook_scala_version'], jupyter_dir))
- sudo('sed -i \'s/CONF_PATH/{}/g\' /home/' + os_user + '/legion/containers/toolchains/python/jupyter_run.sh'.format(docker_jupyter_conf))
- sudo('touch {}'.format(jupyter_conf_file))
- sudo('echo "c.NotebookApp.ip = \'0.0.0.0\'" >> {}'.format(jupyter_conf_file))
- sudo('echo "c.NotebookApp.base_url = \'/{0}/\'" >> {1}'.format(exploratory_name, jupyter_conf_file))
- sudo('echo c.NotebookApp.open_browser = False >> {}'.format(jupyter_conf_file))
- sudo('echo \'c.NotebookApp.cookie_secret = b"{0}"\' >> {1}'.format(id_generator(), jupyter_conf_file))
- sudo('''echo "c.NotebookApp.token = u''" >> {}'''.format(jupyter_conf_file))
- sudo('echo \'c.KernelSpecManager.ensure_native_kernel = False\' >> {}'.format(jupyter_conf_file))
+ sudo('sed -i \'s/CONF_PATH/{}/g\' /home/' + os_user + '/legion/containers/toolchains/python/jupyter_run.sh'.format(docker_jupyter_conf))
+ sudo('touch {}'.format(jupyter_conf_file))
+ sudo('echo "c.NotebookApp.ip = \'0.0.0.0\'" >> {}'.format(jupyter_conf_file))
+ sudo('echo "c.NotebookApp.base_url = \'/{0}/\'" >> {1}'.format(exploratory_name, jupyter_conf_file))
+ sudo('echo c.NotebookApp.open_browser = False >> {}'.format(jupyter_conf_file))
+ sudo('echo \'c.NotebookApp.cookie_secret = b"{0}"\' >> {1}'.format(id_generator(), jupyter_conf_file))
+ sudo('''echo "c.NotebookApp.token = u''" >> {}'''.format(jupyter_conf_file))
+ sudo('echo \'c.KernelSpecManager.ensure_native_kernel = False\' >> {}'.format(jupyter_conf_file))
# sudo('touch {}'.format(spark_script))
# sudo('echo "#!/bin/bash" >> {}'.format(spark_script))
# sudo(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org