This is an automated email from the ASF dual-hosted git repository. mykolabodnar pushed a commit to branch epm-v2.2-rc1-versions in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/epm-v2.2-rc1-versions by this push: new e46f838 [DLAB-1352] - Restudio version updated to 1.2.5033 e46f838 is described below commit e46f8381f4c514e42261db612c32708165805c0d Author: Mykola_Bodnar1 <bodnarmyk...@gmail.com> AuthorDate: Thu Dec 19 17:47:22 2019 +0200 [DLAB-1352] - Restudio version updated to 1.2.5033 --- .../scripts/deploy_repository/deploy_repository.py | 2 +- infrastructure-provisioning/src/general/conf/dlab.ini | 2 +- infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +- infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py index 57f8335..dbc65d0 100644 --- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py +++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py @@ -1187,7 +1187,7 @@ def download_packages(): 'http://central.maven.org/maven2/org/jfree/jcommon/{0}/jcommon-{0}.jar'.format('1.0.24'), '--no-check-certificate https://brunelvis.org/jar/spark-kernel-brunel-all-{0}.jar'.format('2.3'), 'http://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree-pip/toree-0.2.0.tar.gz', - 'https://download2.rstudio.org/rstudio-server-{}-amd64.deb'.format( + 'https://download2.rstudio.org/server/trusty/amd64/rstudio-server-{}-amd64.deb'.format( configuration['notebook_rstudio_version']), 'http://us.download.nvidia.com/XFree86/Linux-x86_64/{0}/NVIDIA-Linux-x86_64-{0}.run'.format( configuration['notebook_nvidia_version']), diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini b/infrastructure-provisioning/src/general/conf/dlab.ini index 6f58486..70561c5 100644 --- a/infrastructure-provisioning/src/general/conf/dlab.ini +++ b/infrastructure-provisioning/src/general/conf/dlab.ini @@ -226,7 +226,7 @@ tensorflow_version = 1.8.0 ### Version of Zeppelin to be installed on notebook zeppelin_version = 0.8.2 ### Version of Rstudio to be installed on notebook -rstudio_version = 1.1.463 +rstudio_version = 1.2.5033 ### Version of Scala to be installed on notebook scala_version = 2.12.8 ### Version of Livy top be installed on notebook 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 76dfb1b..87f3819 100644 --- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py @@ -114,7 +114,7 @@ def install_rstudio(os_user, local_spark_path, rstudio_pass, rstudio_version): try: sudo('apt-get install -y r-base') sudo('apt-get install -y gdebi-core') - sudo('wget https://download2.rstudio.org/rstudio-server-{}-amd64.deb'.format(rstudio_version)) + sudo('wget https://download2.rstudio.org/server/trusty/amd64/rstudio-server-{}-amd64.deb'.format(rstudio_version)) sudo('gdebi -n rstudio-server-{}-amd64.deb'.format(rstudio_version)) sudo('mkdir -p /mnt/var') sudo('chown {0}:{0} /mnt/var'.format(os_user)) diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py index 700e33a..17ff931 100644 --- a/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py +++ b/infrastructure-provisioning/src/general/lib/os/redhat/notebook_lib.py @@ -108,7 +108,7 @@ def ensure_r(os_user, r_libs, region, r_mirror): def install_rstudio(os_user, local_spark_path, rstudio_pass, rstudio_version): if not exists('/home/' + os_user + '/.ensure_dir/rstudio_ensured'): try: - sudo('yum install -y --nogpgcheck https://download2.rstudio.org/rstudio-server-rhel-{}-x86_64.rpm'.format(rstudio_version)) + sudo('yum install -y --nogpgcheck https://download2.rstudio.org/server/centos6/x86_64/rstudio-server-rhel-{}-x86_64.rpm'.format(rstudio_version)) sudo('mkdir -p /mnt/var') sudo('chown {0}:{0} /mnt/var'.format(os_user)) sudo("sed -i '/Type=forking/a \Environment=USER=dlab-user' /etc/systemd/system/rstudio-server.service") --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org