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/09/20 09:37:35 UTC
[incubator-dlab] branch DLAB-433 updated: [DLAB-433] bugfixing
after merging develop branch
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 db94dbc [DLAB-433] bugfixing after merging develop branch
db94dbc is described below
commit db94dbc855699f1c8a523830a9070cb652b5a49b
Author: Dyoma33 <de...@gmail.com>
AuthorDate: Fri Sep 20 12:37:12 2019 +0300
[DLAB-433] bugfixing after merging develop branch
---
.../src/general/scripts/gcp/jupyter-docker_configure.py | 4 ++--
infrastructure-provisioning/src/jupyter-docker/Dockerfile_jupyter | 2 +-
.../src/jupyter-docker/scripts/configure_jupyter-docker_node.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/jupyter-docker_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/jupyter-docker_configure.py
index 23d2704..d1104e6 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter-docker_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter-docker_configure.py
@@ -214,7 +214,7 @@ if __name__ == "__main__":
print("Looks like it's first time we configure notebook server. Creating images.")
image_id_list = GCPActions().create_image_from_instance_disks(
notebook_config['expected_primary_image_name'], notebook_config['expected_secondary_image_name'],
- notebook_config['instance_name'], notebook_config['zone'])
+ notebook_config['instance_name'], notebook_config['zone'], notebook_config['image_labels'])
if image_id_list and image_id_list[0] != '':
print("Image of primary disk was successfully created. It's ID is {}".format(image_id_list[0]))
else:
@@ -242,7 +242,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_ip,
notebook_config['ssh_key_path'],
notebook_config['dlab_ssh_user'],
'jupyter',
diff --git a/infrastructure-provisioning/src/jupyter-docker/Dockerfile_jupyter b/infrastructure-provisioning/src/jupyter-docker/Dockerfile_jupyter
index f744a10..bd77159 100644
--- a/infrastructure-provisioning/src/jupyter-docker/Dockerfile_jupyter
+++ b/infrastructure-provisioning/src/jupyter-docker/Dockerfile_jupyter
@@ -19,7 +19,7 @@
#
# ******************************************************************************
-FROM legionplatformtest/python-toolchain:1.0.0-rc14
+FROM legionplatformtest/jupyterlab:1.0.0-rc18
ARG NB_USER="dlab-user"
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 0af26b4..0ea1bd0 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
@@ -113,7 +113,7 @@ if __name__ == "__main__":
print("Install nodejs")
install_nodejs(args.os_user)
print("Install ungit")
- install_ungit(args.os_user, args.exploratory_name)
+ install_ungit(args.os_user, args.exploratory_name, args.edge_ip)
if exists('/home/{0}/{1}'.format(args.os_user, gitlab_certfile)):
install_gitlab_cert(args.os_user, gitlab_certfile)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org