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 2022/06/07 07:37:35 UTC

[incubator-datalab] branch DATALAB-2840 updated (9ff14cbc6 -> f1ae71906)

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

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


 discard 9ff14cbc6 [DATALAB-2840]: changed how nodejs is installed
 discard b6e40e62a [DATALAB-2840]: changed how nodejs is installed
 discard 460af92b7 [DATALAB-2840]: changed how nodejs is installed
 discard c2dfdfcad [DATALAB-2840]: changed how nodejs is installed
     new f1ae71906 [DATALAB-2840]: specified nodejs version

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (9ff14cbc6)
            \
             N -- N -- N   refs/heads/DATALAB-2840 (f1ae71906)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/general/lib/os/debian/notebook_lib.py                      | 7 ++++---
 infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py   | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)


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


[incubator-datalab] 01/01: [DATALAB-2840]: specified nodejs version

Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f1ae71906e9f75f6a901ef08ec76d8746f46bb3e
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Jun 7 10:37:21 2022 +0300

    [DATALAB-2840]: specified nodejs version
---
 infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 ++
 infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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 53ea073ab..7715d2c7e 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -476,6 +476,8 @@ def install_nodejs(os_user):
             datalab.fab.conn.sudo('add-apt-repository --remove ppa:deadsnakes/ppa -y')
         datalab.fab.conn.sudo('curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -')
         manage_pkg('-y install', 'remote', 'nodejs')
+        datalab.fab.conn.sudo('curl -s -O https://deb.nodesource.com/node_16.x/pool/main/n/nodejs/nodejs_16.15.0-1nodesource1_amd64.deb')
+        datalab.fab.conn.sudo('dpkg -i nodejs_16.15.0-1nodesource1_amd64.deb && rm nodejs_16.15.0-1nodesource1_amd64.deb')
         datalab.fab.conn.sudo('touch /home/{}/.ensure_dir/nodejs_ensured'.format(os_user))
 
 def install_os_pkg(requisites):
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index ce02efe98..a8d4a4920 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -383,7 +383,7 @@ def install_build_dep():
                     '&& sudo unzip apache-maven-{1}-bin.zip && sudo mv apache-maven-{1} maven'.format(
                         maven_version.split('.')[0], maven_version))
             datalab.fab.conn.sudo('bash -c "curl --silent --location https://deb.nodesource.com/setup_16.x | bash -"')
-            manage_pkg('-y install', 'remote', 'nodejs')
+            manage_pkg('-y install', 'remote', 'nodejs=16.15.0')
             datalab.fab.conn.sudo('npm config set unsafe-perm=true')
             datalab.fab.conn.sudo('touch {}tmp/build_dep_ensured'.format(os.environ['ssn_datalab_path']))
     except Exception as err:


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