diff --git a/images/linux/scripts/installers/netlify.sh b/images/linux/scripts/installers/netlify.sh deleted file mode 100644 index 609a6a2e5..000000000 --- a/images/linux/scripts/installers/netlify.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: netlify.sh -## Desc: Installs the Netlify CLI -################################################################################ - -# Install the Netlify CLI -npm i -g netlify-cli - -invoke_tests "Tools" "Netlify" \ No newline at end of file diff --git a/images/linux/scripts/installers/nodejs.sh b/images/linux/scripts/installers/nodejs.sh index cce8f135c..3bee08f1f 100644 --- a/images/linux/scripts/installers/nodejs.sh +++ b/images/linux/scripts/installers/nodejs.sh @@ -7,8 +7,15 @@ # Install LTS Node.js and related build tools curl -sL https://raw.githubusercontent.com/mklement0/n-install/stable/bin/n-install | bash -s -- -ny - ~/n/bin/n lts -npm install -g grunt gulp n parcel-bundler typescript newman +npm install -g grunt gulp n parcel-bundler typescript newman vercel npm install -g --save-dev webpack webpack-cli + +# Install the Netlify CLI using --unsafe-perm=true options to avoid permission issues +npm install -g --unsafe-perm=true netlify-cli + +echo "Creating the symlink for [now] command to vercel CLI" +ln -s /usr/local/bin/vercel /usr/local/bin/now + rm -rf ~/n # Install Yarn repository and key diff --git a/images/linux/scripts/installers/vercel.sh b/images/linux/scripts/installers/vercel.sh deleted file mode 100644 index 595b89b3a..000000000 --- a/images/linux/scripts/installers/vercel.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: vercel.sh -## Desc: Installs the Vercel CLI -################################################################################ - -# Install the Vercel CLI -npm i -g vercel - -echo "Creating the symlink for [now] command to vercel CLI" -ln -s /usr/local/bin/vercel /usr/local/bin/now - -invoke_tests "CLI.Tools" "Vercel CLI" \ No newline at end of file diff --git a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 b/images/linux/scripts/tests/CLI.Tools.Tests.ps1 index ceb61cf5f..c7e43bb90 100644 --- a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 +++ b/images/linux/scripts/tests/CLI.Tools.Tests.ps1 @@ -59,14 +59,4 @@ Describe "Oras CLI" { It "Oras CLI" { "oras version" | Should -ReturnZeroExitCode } -} - -Describe "Vercel CLI" { - It "Vercel CLI" { - "vercel --version" | Should -ReturnZeroExitCode - } - - It "Validate the symlink link [now]" { - "now --version" | Should -ReturnZeroExitCode - } } \ No newline at end of file diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index 922d59fd8..8b2447307 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -275,12 +275,6 @@ Describe "Conda" { } } -Describe "Netlify" { - It "netlify" { - "netlify --version" | Should -ReturnZeroExitCode - } -} - Describe "Packer" { It "packer" { "packer --version" | Should -ReturnZeroExitCode @@ -322,7 +316,7 @@ Describe "Containers" -Skip:(Test-IsUbuntu16) { } Describe "Node.js" { - $testCases = @("node", "grunt", "gulp", "webpack", "parcel", "yarn", "newman") | ForEach-Object { @{NodeCommand = $_} } + $testCases = @("node", "grunt", "gulp", "webpack", "parcel", "yarn", "newman", "netlify", "vercel", "now") | ForEach-Object { @{NodeCommand = $_} } It "" -TestCases $testCases { param ( @@ -330,7 +324,7 @@ Describe "Node.js" { ) "$NodeCommand --version" | Should -ReturnZeroExitCode - } + } } Describe "nvm" { diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index 911fb6798..cdb33e709 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -235,10 +235,8 @@ "{{template_dir}}/scripts/installers/terraform.sh", "{{template_dir}}/scripts/installers/packer.sh", "{{template_dir}}/scripts/installers/vcpkg.sh", - "{{template_dir}}/scripts/installers/vercel.sh", "{{template_dir}}/scripts/installers/dpkg-config.sh", "{{template_dir}}/scripts/installers/mongodb.sh", - "{{template_dir}}/scripts/installers/netlify.sh", "{{template_dir}}/scripts/installers/nginx.sh", "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/pypy.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 01e9119df..faa2fe3bf 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -240,10 +240,8 @@ "{{template_dir}}/scripts/installers/terraform.sh", "{{template_dir}}/scripts/installers/packer.sh", "{{template_dir}}/scripts/installers/vcpkg.sh", - "{{template_dir}}/scripts/installers/vercel.sh", "{{template_dir}}/scripts/installers/dpkg-config.sh", "{{template_dir}}/scripts/installers/mongodb.sh", - "{{template_dir}}/scripts/installers/netlify.sh", "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh" diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 93ae047ac..2b52f1c18 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -240,10 +240,8 @@ "{{template_dir}}/scripts/installers/terraform.sh", "{{template_dir}}/scripts/installers/packer.sh", "{{template_dir}}/scripts/installers/vcpkg.sh", - "{{template_dir}}/scripts/installers/vercel.sh", "{{template_dir}}/scripts/installers/dpkg-config.sh", "{{template_dir}}/scripts/installers/mongodb.sh", - "{{template_dir}}/scripts/installers/netlify.sh", "{{template_dir}}/scripts/installers/android.sh", "{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/python.sh",