From 1e35500bda4b00fadc1b2881865ad3cffaa69ff8 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 15 Nov 2022 14:51:00 -0800
Subject: Node: Fix bug - version set by Feature is not default (#294)

* Node:Fix bug version set by Feature is not default

* node not supported for ubuntu:bionic
---
 src/node/devcontainer-feature.json | 2 +-
 src/node/install.sh                | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 538ecb2..49d2160 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "Node.js (via nvm) and yarn",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, and needed dependencies.",
diff --git a/src/node/install.sh b/src/node/install.sh
index f51306e..2f2e7aa 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -81,6 +81,12 @@ check_packages() {
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
 
+. /etc/os-release
+if [[ "bionic" = *"${VERSION_CODENAME}"* ]]; then
+    echo "(!) Unsupported distribution version '${VERSION_CODENAME}'. Details: https://github.com/nodejs/node/issues/42351#issuecomment-1068424442"
+    exit 1
+fi
+
 # Install dependencies
 check_packages apt-transport-https curl ca-certificates tar gnupg2 dirmngr
 
@@ -152,7 +158,7 @@ if [ ! -d "${NVM_DIR}" ]; then
 else
     echo "NVM already installed."
     if [ "${NODE_VERSION}" != "" ]; then
-        su ${USERNAME} -c "umask 0002 && . $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION}"
+        su ${USERNAME} -c "umask 0002 && . $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION} && nvm alias default ${NODE_VERSION}"
     fi
 fi
 
-- 
cgit v1.2.3