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/11/07 15:21:08 UTC
[incubator-dlab] 01/01: [DLAB-433] Moved jupyterlab image reference
to dlab.ini
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 e3af06d7d9e114bbb9ba0e5c0887ab516c820369
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Thu Nov 7 17:20:34 2019 +0200
[DLAB-433] Moved jupyterlab image reference to dlab.ini
---
infrastructure-provisioning/src/general/conf/dlab.ini | 2 ++
infrastructure-provisioning/src/general/lib/os/fab.py | 1 +
infrastructure-provisioning/src/jupyterlab/Dockerfile_jupyterlab | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini
index 82d666f..5ffb20b 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -273,6 +273,8 @@ numpy_version = 1.14.3
ivy_version = 2.4.0
### Matplotlib version
matplotlib_version = 2.0.2
+### JupyterLab image
+jupyterlab_image = legionplatformtest/jupyterlab:1.0.0-rc21
#--- [emr] section contains all parameters that are using for emr provisioning ---#
[emr]
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 5ffb917..8b3f5f7 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -239,6 +239,7 @@ def ensure_jupyterlab_files(os_user, jupyterlab_dir, jupyter_conf_file, jupyterl
sudo('mv /tmp/build.sh {}build.sh'.format(jupyterlab_dir))
sudo('mv /tmp/start.sh {}start.sh'.format(jupyterlab_dir))
sudo('sed -i \'s/nb_user/{}/g\' {}Dockerfile_jupyterlab'.format(os_user, jupyterlab_dir))
+ sudo('sed -i \'s/jupyterlab_image/{}/g\' {}Dockerfile_jupyterlab'.format(os.environ['notebook_jupyter_image'], jupyterlab_dir))
sudo('sed -i \'s/nb_user/{}/g\' {}start.sh'.format(os_user, jupyterlab_dir))
# sudo('sed -i \'s/jup_version/{}/g\' {}Dockerfile_jupyterlab'.format(jupyter_version, jupyterlab_dir))
# sudo('sed -i \'s/hadoop_version/{}/g\' {}Dockerfile_jupyterlab'.format(os.environ['notebook_hadoop_version'], jupyterlab_dir))
diff --git a/infrastructure-provisioning/src/jupyterlab/Dockerfile_jupyterlab b/infrastructure-provisioning/src/jupyterlab/Dockerfile_jupyterlab
index 3741c6e..8fa3202 100644
--- a/infrastructure-provisioning/src/jupyterlab/Dockerfile_jupyterlab
+++ b/infrastructure-provisioning/src/jupyterlab/Dockerfile_jupyterlab
@@ -19,7 +19,7 @@
#
# ******************************************************************************
-FROM legionplatformtest/jupyterlab:1.0.0-rc18
+FROM jupyterlab_image
ARG NB_USER="dlab-user"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org