You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/11/08 14:23:18 UTC

[incubator-datalab] 01/01: [DATALAB-2589]: fixed sbt install

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DATALAB-2589
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 2893a487015a31e9292d2786dfe8bddadee15c05
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Nov 8 16:22:52 2021 +0200

    [DATALAB-2589]: fixed sbt install
---
 .../src/general/lib/os/debian/notebook_lib.py                  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 c2ce552..301f7be 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -185,15 +185,19 @@ def ensure_matplot(os_user):
 @backoff.on_exception(backoff.expo, SystemExit, max_tries=10)
 def add_sbt_key():
     datalab.fab.conn.sudo(
-        'curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add')
+        'curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo -H gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/scalasbt-release.gpg --import')
 
 def ensure_sbt(os_user):
     if not exists(datalab.fab.conn,'/home/' + os_user + '/.ensure_dir/sbt_ensured'):
         try:
             manage_pkg('-y install', 'remote', 'apt-transport-https')
-            datalab.fab.conn.sudo('echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list')
-
+            datalab.fab.conn.sudo('echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list')
+            datalab.fab.conn.sudo(
+                'echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee /etc/apt/sources.list.d/sbt_old.list')
             add_sbt_key()
+            datalab.fab.conn.sudo(
+                'sudo chmod 644 /etc/apt/trusted.gpg.d/scalasbt-release.gpg')
+
             manage_pkg('update', 'remote', '')
             manage_pkg('-y install', 'remote', 'sbt')
             datalab.fab.conn.sudo('touch /home/' + os_user + '/.ensure_dir/sbt_ensured')

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org