This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DATALAB-2091 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit cf0e02dfc379364970f65228dd597ab2354af374 Author: leonidfrolov <[email protected]> AuthorDate: Tue Mar 16 15:06:11 2021 +0200 [DATALAB-2091]: changed http and https_proxy variables assignment --- .../src/general/lib/os/debian/notebook_lib.py | 10 +++++----- infrastructure-provisioning/src/general/lib/os/fab.py | 4 ++-- 2 files changed, 7 insertions(+), 7 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 c94948b..c652e06 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py @@ -129,10 +129,10 @@ def install_rstudio(os_user, local_spark_path, rstudio_pass, rstudio_version): datalab.fab.conn.sudo('gdebi -n rstudio-server-{}-amd64.deb'.format(rstudio_version)) datalab.fab.conn.sudo('mkdir -p /mnt/var') datalab.fab.conn.sudo('chown {0}:{0} /mnt/var'.format(os_user)) - http_proxy = datalab.fab.conn.run('''bash -l -c 'echo $http_proxy' ''') - https_proxy = datalab.fab.conn.run('''bash -l -c 'echo $https_proxy' ''') + http_proxy = datalab.fab.conn.run('''bash -l -c 'echo $http_proxy' ''').stdout.replace('\n','') + https_proxy = datalab.fab.conn.run('''bash -l -c 'echo $https_proxy' ''').stdout.replace('\n','') datalab.fab.conn.sudo("sed -i '/Type=forking/a \Environment=USER=datalab-user' /lib/systemd/system/rstudio-server.service") - datalab.fab.conn.sudo('''bash -l -c "sed -i '/ExecStart/s|=/usr/lib/rstudio-server/bin/rserver|=/bin/bash -c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64; /usr/lib/rstudio-server/bin/rserver --auth-none 1|g' /lib/systemd/system/rstudio-server.service" ''') + datalab.fab.conn.sudo("sed -i '/ExecStart/s|=/usr/lib/rstudio-server/bin/rserver|=/bin/bash -c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64; /usr/lib/rstudio-server/bin/rserver --auth-none 1|g' /lib/systemd/system/rstudio-server.service") datalab.fab.conn.sudo("sed -i '/ExecStart/s|$|\"|g' /lib/systemd/system/rstudio-server.service") datalab.fab.conn.sudo( 'sed -i \'/\[Service\]/a Environment=\"HTTP_PROXY={}\"\' /lib/systemd/system/rstudio-server.service'.format( @@ -316,8 +316,8 @@ def install_tensor(os_user, cuda_version, cuda_file_name, datalab.fab.conn.sudo('mkdir /var/log/tensorboard; chown {0}:{0} -R /var/log/tensorboard'.format(os_user)) datalab.fab.conn.put('{}tensorboard.service'.format(templates_dir), '/tmp/tensorboard.service') datalab.fab.conn.sudo("sed -i 's|OS_USR|{}|' /tmp/tensorboard.service".format(os_user)) - http_proxy = datalab.fab.conn.run('''bash -l -c 'echo $http_proxy' ''') - https_proxy = datalab.fab.conn.run('''bash -l -c 'echo $https_proxy' ''') + http_proxy = datalab.fab.conn.run('''bash -l -c 'echo $http_proxy' ''').stdout.replace('\n','') + https_proxy = datalab.fab.conn.run('''bash -l -c 'echo $https_proxy' ''').stdout.replace('\n','') datalab.fab.conn.sudo('sed -i \'/\[Service\]/ a\Environment=\"HTTP_PROXY={}\"\' /tmp/tensorboard.service'.format( http_proxy)) datalab.fab.conn.sudo('sed -i \'/\[Service\]/ a\Environment=\"HTTPS_PROXY={}\"\' /tmp/tensorboard.service'.format( diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py index f2255c6..e35cd95 100644 --- a/infrastructure-provisioning/src/general/lib/os/fab.py +++ b/infrastructure-provisioning/src/general/lib/os/fab.py @@ -207,9 +207,9 @@ def configure_jupyter(os_user, jupyter_conf_file, templates_dir, jupyter_version conn.put(templates_dir + 'jupyter-notebook.service', '/tmp/jupyter-notebook.service') conn.sudo("chmod 644 /tmp/jupyter-notebook.service") if os.environ['application'] == 'tensor': - conn.sudo('''bash -l -c "sed -i '/ExecStart/s|-c \"|-c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64; |g' /tmp/jupyter-notebook.service" ''') + conn.sudo("sed -i '/ExecStart/s|-c \"|-c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64; |g' /tmp/jupyter-notebook.service") elif os.environ['application'] == 'deeplearning': - conn.sudo('''bash -l -c "sed -i '/ExecStart/s|-c \"|-c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64:/usr/lib64/openmpi/lib: ; export PYTHONPATH=/home/" ''' + os_user + + conn.sudo("sed -i '/ExecStart/s|-c \"|-c \"export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/cudnn/lib64:/usr/local/cuda/lib64:/usr/lib64/openmpi/lib: ; export PYTHONPATH=/home/" + os_user + "/caffe/python:/home/" + os_user + "/pytorch/build:$PYTHONPATH ; |g' /tmp/jupyter-notebook.service") conn.sudo("sed -i 's|CONF_PATH|{}|' /tmp/jupyter-notebook.service".format(jupyter_conf_file)) conn.sudo("sed -i 's|OS_USR|{}|' /tmp/jupyter-notebook.service".format(os_user)) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
