From b00dbe1036465c86ef56f780fe3456ca53f5581b Mon Sep 17 00:00:00 2001
From: Dmitry Shibanov <dmitry-shibanov@github.com>
Date: Wed, 31 Mar 2021 10:33:46 +0300
Subject: [PATCH] install yarn from npm (#3037)

---
 images/linux/scripts/installers/nodejs.sh | 8 --------
 images/linux/toolsets/toolset-1604.json   | 4 ++++
 images/linux/toolsets/toolset-1804.json   | 4 ++++
 images/linux/toolsets/toolset-2004.json   | 4 ++++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh
index 020662f3b..a9a108235 100644
--- a/images/linux/scripts/installers/nodejs.sh
+++ b/images/linux/scripts/installers/nodejs.sh
@@ -32,12 +32,4 @@ ln -s /usr/local/bin/vercel /usr/local/bin/now
 
 rm -rf ~/n
 
-# Install Yarn repository and key
-curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-apt-get update
-
-# Install yarn
-apt-get install -y --no-install-recommends yarn
-
 invoke_tests "Node" "Node.js"
diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json
index 1bacd5e23..c332a88d7 100644
--- a/images/linux/toolsets/toolset-1604.json
+++ b/images/linux/toolsets/toolset-1604.json
@@ -296,6 +296,10 @@
         {
             "name": "netlify-cli",
             "command": "netlify"
+        },
+        {
+            "name": "yarn",
+            "command": "yarn"
         }
     ]
 }
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index cc96345bf..05c7ba6d3 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -303,6 +303,10 @@
         {
             "name": "netlify-cli",
             "command": "netlify"
+        },
+        {
+            "name": "yarn",
+            "command": "yarn"
         }
     ]
 }
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 1339c1649..238a21911 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -310,6 +310,10 @@
         {
             "name": "lerna",
             "command": "lerna"
+        },
+        {
+            "name": "yarn",
+            "command": "yarn"
         }
     ]
 }