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/17 13:43:12 UTC
[incubator-dlab] branch DLAB-433 updated: [DLAB-623] Parametrized
Dockerfile_jupyter(Bugfixing)
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
The following commit(s) were added to refs/heads/DLAB-433 by this push:
new 2b7b342 [DLAB-623] Parametrized Dockerfile_jupyter(Bugfixing)
2b7b342 is described below
commit 2b7b342490692ee678ef3dadded1c51567bdbd33
Author: Dyoma33 <de...@gmail.com>
AuthorDate: Fri May 17 16:43:03 2019 +0300
[DLAB-623] Parametrized Dockerfile_jupyter(Bugfixing)
---
.../src/general/lib/os/fab.py | 20 ++++++++++----------
.../scripts/configure_jupyter-docker_node.py | 4 ----
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index b11a836..a0edd3c 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -228,18 +228,18 @@ def ensure_jupyter_docker_files(os_user, legion_dir, templates_dir, jupyter_dir,
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/\' {}py3spark_local_template.json'.format(jupyter_dir))
+ sudo('sed -i \'s/3.5/3.6/g\' {}py3spark_local_template.json'.format(jupyter_dir))
sudo('mv /tmp/jupyter_run.sh {}jupyter_run.sh'.format(jupyter_dir))
sudo('mv /tmp/Dockerfile_jupyter {}Dockerfile_jupyter'.format(jupyter_dir))
- sudo('sed -i \'s/nb_user/{}/\' {}Dockerfile_jupyter'.format(os_user, jupyter_dir))
- sudo('sed -i \'s/jup_version/{}/\' {}Dockerfile_jupyter'.format(jupyter_version, jupyter_dir))
- sudo('sed -i \'s/hadoop_version/{}/\' {}Dockerfile_jupyter'.format(os.environ['notebook_hadoop_version'], jupyter_dir))
- sudo('sed -i \'s/tornado_version/{}/\' {}Dockerfile_jupyter'.format(os.environ['notebook_tornado_version'], jupyter_dir))
- sudo('sed -i \'s/matplotlib_version/{}/\' {}Dockerfile_jupyter'.format(os.environ['notebook_matplotlib_version'], jupyter_dir))
- sudo('sed -i \'s/numpy_version/{}/\' {}Dockerfile_jupyter'.format(os.environ['notebook_numpy_version'], jupyter_dir))
- sudo('sed -i \'s/spark_version/{}/\' {}Dockerfile_jupyter'.format(os.environ['notebook_spark_version'], jupyter_dir))
- sudo('sed -i \'s/scala_version/{}/\' {}Dockerfile_jupyter'.format(os.environ['notebook_scala_version'], jupyter_dir))
- sudo('sed -i \'s/CONF_PATH/{}/\' {}jupyter_run.sh'.format(docker_jupyter_conf, jupyter_dir))
+ sudo('sed -i \'s/nb_user/{}/g\' {}Dockerfile_jupyter'.format(os_user, jupyter_dir))
+ 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))
+ sudo('sed -i \'s/matplotlib_version/{}/g\' {}Dockerfile_jupyter'.format(os.environ['notebook_matplotlib_version'], 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\' {}jupyter_run.sh'.format(docker_jupyter_conf, jupyter_dir))
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))
diff --git a/infrastructure-provisioning/src/jupyter-docker/scripts/configure_jupyter-docker_node.py b/infrastructure-provisioning/src/jupyter-docker/scripts/configure_jupyter-docker_node.py
index e750254..9fdb5fd 100644
--- a/infrastructure-provisioning/src/jupyter-docker/scripts/configure_jupyter-docker_node.py
+++ b/infrastructure-provisioning/src/jupyter-docker/scripts/configure_jupyter-docker_node.py
@@ -52,10 +52,6 @@ else:
spark_link = "https://archive.apache.org/dist/spark/spark-" + spark_version + "/spark-" + spark_version + \
"-bin-hadoop" + hadoop_version + ".tgz"
-tornado_version = os.environ['notebook_tornado_version']
-matplotlib
-numpy
-scala
docker_version = '18.09.4'
http_file = '/etc/systemd/system/docker.service.d/http-proxy.conf'
https_file = '/etc/systemd/system/docker.service.d/https-proxy.conf'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org