You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by my...@apache.org on 2020/04/16 16:44:01 UTC
[incubator-dlab] branch DLAB-515 updated: [DLAB-515]: [GCP] Ubuntu
version changed
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-515
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-515 by this push:
new 9642ba4 [DLAB-515]: [GCP] Ubuntu version changed
9642ba4 is described below
commit 9642ba4083c3bfe1304b77f8c98e4c9620d59a13
Author: bodnarmykola <bo...@gmail.com>
AuthorDate: Thu Apr 16 19:41:37 2020 +0300
[DLAB-515]: [GCP] Ubuntu version changed
---
.../src/general/lib/os/debian/notebook_lib.py | 5 +++--
infrastructure-provisioning/src/general/lib/os/fab.py | 4 ++--
.../src/general/scripts/os/common_configure_reverse_proxy.py | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index d1fa44a..b63dd3b 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -165,13 +165,14 @@ def ensure_matplot(os_user):
@backoff.on_exception(backoff.expo, SystemExit, max_tries=10)
def add_sbt_key():
sudo(
- 'apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 642AC823')
+ 'curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add')
def ensure_sbt(os_user):
if not exists('/home/' + os_user + '/.ensure_dir/sbt_ensured'):
try:
manage_pkg('-y install', 'remote', 'apt-transport-https')
sudo('echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list')
+
add_sbt_key()
manage_pkg('update', 'remote', '')
manage_pkg('-y install', 'remote', 'sbt')
@@ -358,7 +359,7 @@ def install_livy_dependencies_emr(os_user):
def install_nodejs(os_user):
if not exists('/home/{}/.ensure_dir/nodejs_ensured'.format(os_user)):
- sudo('curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -')
+ sudo('curl -sL https://deb.nodesource.com/setup_13.x | sudo -E bash -')
manage_pkg('-y install', 'remote', 'nodejs')
sudo('touch /home/{}/.ensure_dir/nodejs_ensured'.format(os_user))
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index e5fc30f..03b1d85 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -152,8 +152,8 @@ def configure_jupyter(os_user, jupyter_conf_file, templates_dir, jupyter_version
try:
sudo('pip2 install notebook==5.7.8 --no-cache-dir')
sudo('pip2 install jupyter --no-cache-dir')
- sudo('pip3.5 install notebook=={} --no-cache-dir'.format(jupyter_version))
- sudo('pip3.5 install jupyter --no-cache-dir')
+ sudo('pip3 install notebook=={} --no-cache-dir'.format(jupyter_version))
+ sudo('pip3 install jupyter --no-cache-dir')
sudo('rm -rf {}'.format(jupyter_conf_file))
run('jupyter notebook --generate-config --config {}'.format(jupyter_conf_file))
with cd('/home/{}'.format(os_user)):
diff --git a/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py b/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py
index b30d6df..53cba79 100644
--- a/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py
+++ b/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py
@@ -107,7 +107,7 @@ if __name__ == "__main__":
env.key_filename = [args.keyfile]
env.host_string = args.os_user + '@' + args.edge_hostname
put('/tmp/{}.conf'.format(conf_file_name), '/usr/local/openresty/nginx/conf/locations', use_sudo=True)
- sudo('service nginx reload')
+ sudo('service openresty reload')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org