You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2022/07/08 13:48:49 UTC
[incubator-datalab] branch develop updated: [DATALAB-2888]: renewed version of jupyterlab
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new f53b44b6a [DATALAB-2888]: renewed version of jupyterlab
new 373375255 Merge pull request #1592 from a1expol/develop
f53b44b6a is described below
commit f53b44b6a3e2525f938dd95ab0c232f2683db188
Author: Oleksandr Polishchuk2 <ol...@epam.com>
AuthorDate: Fri Jul 8 16:41:33 2022 +0300
[DATALAB-2888]: renewed version of jupyterlab
---
infrastructure-provisioning/src/general/conf/datalab.ini | 4 ++--
.../src/general/files/aws/jupyterlab_description.json | 4 ++--
.../src/general/files/azure/jupyterlab_description.json | 4 ++--
.../src/general/files/gcp/jupyterlab_description.json | 4 ++--
.../src/jupyterlab/Dockerfile_jupyterlab | 12 +++++-------
.../com/epam/datalab/backendapi/domain/NotebookTemplate.java | 2 +-
6 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini b/infrastructure-provisioning/src/general/conf/datalab.ini
index 0b5277b52..bf14aa64d 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -355,7 +355,7 @@ ivy_version = 2.4.0
### Matplotlib version
matplotlib_version = 3.3.4
### JupyterLab image
-jupyterlab_image = odahu\/base-notebook:1.1.0-rc8
+jupyterlab_image = jupyter\/base-notebook:lab-3.4.3
### Superset version
superset_version = 0.35.1
### GCS-connector version
@@ -369,7 +369,7 @@ nbconvert_version = 5.6.1
### nbformat_version
nbformat_version = 5.1.3
### jupyterlab version
-jupyterlab_version = 3.2.9
+jupyterlab_version = 3.4.3
#--- [emr] section contains all parameters that are using for emr provisioning ---#
[emr]
diff --git a/infrastructure-provisioning/src/general/files/aws/jupyterlab_description.json b/infrastructure-provisioning/src/general/files/aws/jupyterlab_description.json
index 487586f17..3e0036934 100644
--- a/infrastructure-provisioning/src/general/files/aws/jupyterlab_description.json
+++ b/infrastructure-provisioning/src/general/files/aws/jupyterlab_description.json
@@ -19,10 +19,10 @@
"exploratory_environment_versions" :
[
{
- "template_name": "JupyterLab 0.35.6",
+ "template_name": "JupyterLab 3.4.3",
"description": "Base image with JupyterLab node creation routines",
"environment_type": "exploratory",
- "version": "jupyter_lab-0.35.6",
+ "version": "jupyter_lab-3.4.3",
"vendor": "AWS"
}
]
diff --git a/infrastructure-provisioning/src/general/files/azure/jupyterlab_description.json b/infrastructure-provisioning/src/general/files/azure/jupyterlab_description.json
index 739bdcfce..5783f9600 100644
--- a/infrastructure-provisioning/src/general/files/azure/jupyterlab_description.json
+++ b/infrastructure-provisioning/src/general/files/azure/jupyterlab_description.json
@@ -15,10 +15,10 @@
"exploratory_environment_versions" :
[
{
- "template_name": "JupyterLab 0.35.6",
+ "template_name": "JupyterLab 3.4.3",
"description": "Base image with JupyterLab node creation routines",
"environment_type": "exploratory",
- "version": "jupyter_lab-0.35.6",
+ "version": "jupyter_lab-3.4.3",
"vendor": "Azure"
}
]
diff --git a/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json b/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json
index 3f202f7e5..6f697936a 100644
--- a/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json
+++ b/infrastructure-provisioning/src/general/files/gcp/jupyterlab_description.json
@@ -23,10 +23,10 @@
"exploratory_environment_versions" :
[
{
- "template_name": "JupyterLab 0.35.6",
+ "template_name": "JupyterLab 3.4.3",
"description": "Base image with JupyterLab node creation routines",
"environment_type": "exploratory",
- "version": "jupyter_lab-0.35.6",
+ "version": "jupyter_lab-3.4.3",
"vendor": "GCP"
}
]
diff --git a/infrastructure-provisioning/src/jupyterlab/Dockerfile_jupyterlab b/infrastructure-provisioning/src/jupyterlab/Dockerfile_jupyterlab
index 9b1977170..ceca3adc3 100644
--- a/infrastructure-provisioning/src/jupyterlab/Dockerfile_jupyterlab
+++ b/infrastructure-provisioning/src/jupyterlab/Dockerfile_jupyterlab
@@ -36,17 +36,15 @@ COPY jupyterlab_run.sh /jupyterlab_run.sh
RUN sed -i 's|CONF_PATH|/etc/jupyter/jupyter_notebook_config.py|' /jupyterlab_run.sh \
&& chmod +x /jupyterlab_run.sh
-RUN apt update && apt install -y vim netcat-openbsd
+RUN apt update && apt install -y vim netcat-openbsd git
-RUN jupyter serverextension enable --py jupyterlab_git && \
- echo "ENABLED PLUGINS:" && \
- jupyter serverextension list
+RUN pip install --upgrade jupyterlab-git
-RUN jupyter labextension disable odahu-flow-jupyterlab-plugin && \
- jupyter serverextension disable --py odahuflow.jupyterlab && \
- jupyter serverextension list && \
+RUN echo "ENABLED PLUGINS:" && \
+ jupyter serverextension list
jupyter labextension list
+
USER $NB_USER
ENTRYPOINT ["/jupyterlab_run.sh", "-d"]
\ No newline at end of file
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java
index a413e5ed9..c66d8cda3 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/domain/NotebookTemplate.java
@@ -27,7 +27,7 @@ import lombok.Getter;
public enum NotebookTemplate {
JUPYTER("Jupyter 6.1.6"),
JUPYTER_GPU("Jupyter 6.1.6 with GPU"),
- JUPYTER_LAB("JupyterLab 0.35.6"),
+ JUPYTER_LAB("JupyterLab 3.4.3"),
ZEPPELIN("Apache Zeppelin 0.9.1"),
DEEP_LEARNING("Deep Learning 2.4"),
TENSOR("Jupyter with TensorFlow 2.5.0"),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org