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/07/16 11:22:56 UTC
[incubator-dlab] branch DLAB-627 updated: [DLAB-627] Bugfix
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-627
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-627 by this push:
new a89e7ab [DLAB-627] Bugfix
a89e7ab is described below
commit a89e7ab00eb844b412cfbc1b7d86172dc7eb79be
Author: Dyoma33 <de...@gmail.com>
AuthorDate: Tue Jul 16 14:22:46 2019 +0300
[DLAB-627] Bugfix
---
.../src/general/scripts/gcp/ssn_configure.py | 1 +
.../src/general/scripts/os/get_list_available_pkgs.py | 4 ++--
.../gcp/jenkins_jobs/create_notebook_server/config.xml | 1 +
.../gcp/jenkins_jobs/manage_git_credentials/config.xml | 1 +
.../gcp/jenkins_jobs/start_notebook_server/config.xml | 1 +
.../templates/gcp/jenkins_jobs/stop_notebook_server/config.xml | 1 +
.../gcp/jenkins_jobs/terminate_notebook_server/config.xml | 1 +
infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json | 10 ++++++++++
infrastructure-provisioning/src/ssn/templates/docker_build.py | 1 +
9 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index fe8235f..e3bf7a1 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -217,6 +217,7 @@ if __name__ == "__main__":
additional_config = [{"name": "base", "tag": "latest"},
{"name": "edge", "tag": "latest"},
{"name": "jupyter", "tag": "latest"},
+ {"name": "jupyter-dockere", "tag": "latest"},
{"name": "rstudio", "tag": "latest"},
{"name": "zeppelin", "tag": "latest"},
{"name": "tensor", "tag": "latest"},
diff --git a/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py b/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py
index c4107a7..384f9e1 100644
--- a/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/get_list_available_pkgs.py
@@ -82,12 +82,12 @@ if __name__ == "__main__":
all_pkgs['os_pkg'] = get_available_os_pkgs()
all_pkgs['java'] = {}
- if os.environ['application'] in ('jupyter', 'zeppelin', 'deeplearning', 'tensor', 'tensor-rstudio', 'rstudio'):
+ if os.environ['application'] in ('jupyter', 'jupyter-docker', 'zeppelin', 'deeplearning', 'tensor', 'tensor-rstudio', 'rstudio'):
all_pkgs['pip2'] = get_available_pip_pkgs("2.7")
all_pkgs['pip3'] = get_available_pip_pkgs("3.5")
all_pkgs['others'] = get_uncategorised_pip_pkgs(all_pkgs['pip2'], all_pkgs['pip3'])
- if (os.environ['application'] in ('jupyter', 'zeppelin')
+ if (os.environ['application'] in ('jupyter', 'jupyter-docker' 'zeppelin')
and os.environ['notebook_r_enabled'] == 'true')\
or os.environ['application'] in ('rstudio', 'tensor-rstudio'):
all_pkgs['r_pkg'] = get_available_r_pkgs()
diff --git a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/create_notebook_server/config.xml b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/create_notebook_server/config.xml
index 903e063..2680303 100644
--- a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/create_notebook_server/config.xml
+++ b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/create_notebook_server/config.xml
@@ -37,6 +37,7 @@ under the License.
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>jupyter</string>
+ <string>jupyter-docker</string>
<string>rstudio</string>
<string>zeppelin</string>
<string>tensor</string>
diff --git a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/manage_git_credentials/config.xml b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/manage_git_credentials/config.xml
index ed7e0b3..fc4a539 100644
--- a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/manage_git_credentials/config.xml
+++ b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/manage_git_credentials/config.xml
@@ -42,6 +42,7 @@ under the License.
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>jupyter</string>
+ <string>jupyter-docker</string>
<string>rstudio</string>
<string>zeppelin</string>
<string>tensor</string>
diff --git a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/start_notebook_server/config.xml b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/start_notebook_server/config.xml
index cff88ae..c2a7b94 100644
--- a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/start_notebook_server/config.xml
+++ b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/start_notebook_server/config.xml
@@ -42,6 +42,7 @@ under the License.
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>jupyter</string>
+ <string>jupyter-docker</string>
<string>rstudio</string>
<string>zeppelin</string>
<string>tensor</string>
diff --git a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/stop_notebook_server/config.xml b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/stop_notebook_server/config.xml
index 736431f..9673506 100644
--- a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/stop_notebook_server/config.xml
+++ b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/stop_notebook_server/config.xml
@@ -42,6 +42,7 @@ under the License.
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>jupyter</string>
+ <string>jupyter-docker</string>
<string>rstudio</string>
<string>zeppelin</string>
<string>tensor</string>
diff --git a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/terminate_notebook_server/config.xml b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/terminate_notebook_server/config.xml
index a466df4..3ec66b8 100644
--- a/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/terminate_notebook_server/config.xml
+++ b/infrastructure-provisioning/src/general/templates/gcp/jenkins_jobs/terminate_notebook_server/config.xml
@@ -42,6 +42,7 @@ under the License.
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
<string>jupyter</string>
+ <string>jupyter-docker</string>
<string>rstudio</string>
<string>zeppelin</string>
<string>tensor</string>
diff --git a/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json b/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json
index 47ce720..cc8237d 100644
--- a/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json
+++ b/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json
@@ -90,6 +90,16 @@
]
},
{
+ "_id": "nbCreateJupyter-Docker",
+ "description": "Create Notebook Jupyter-Docker",
+ "exploratories": [
+ "docker.dlab-jupyter-docker"
+ ],
+ "groups": [
+ "$anyuser"
+ ]
+ },
+ {
"_id": "nbCreateRstudio",
"description": "Create Notebook RStudio",
"exploratories": [
diff --git a/infrastructure-provisioning/src/ssn/templates/docker_build.py b/infrastructure-provisioning/src/ssn/templates/docker_build.py
index fd44b42..32f3ef7 100644
--- a/infrastructure-provisioning/src/ssn/templates/docker_build.py
+++ b/infrastructure-provisioning/src/ssn/templates/docker_build.py
@@ -32,6 +32,7 @@ if sys.argv[1] == 'all':
node = [
'edge',
'jupyter',
+ 'jupyter-docker'
'rstudio',
'zeppelin',
'tensor',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org