RHEL support added

src/node/NOTES.md

@@ -20,7 +20,7 @@ Alternatively, you can start up an interactive shell which will in turn source `
 
 ## OS Support
 
-Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the apt, yum, dnf, or microdnf package manager installed.
+Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and Rocky Linux distributions with the apt, yum, dnf, or microdnf package manager installed.
 
 RedHat 7 Family (RedHat, CentOS, etc.) must use Node versions < 18.
 

src/node/README.md

@@ -13,12 +13,12 @@ Installs Node.js, nvm, yarn, pnpm, and needed dependencies.
 
 ## Options
 
-| Options Id          | Description                                                     | Type    | Default Value        |
-| ------------------- | --------------------------------------------------------------- | ------- | -------------------- |
-| version             | Select or enter a Node.js version to install                    | string  | lts                  |
-| nodeGypDependencies | Install dependencies to compile native node modules (node-gyp)? | boolean | true                 |
-| nvmInstallPath      | The path where NVM will be installed.                           | string  | /usr/local/share/nvm |
-| nvmVersion          | Version of NVM to install.                                      | string  | latest               |
+| Options Id | Description | Type | Default Value |
+|-----|-----|-----|-----|
+| version | Select or enter a Node.js version to install | string | lts |
+| nodeGypDependencies | Install dependencies to compile native node modules (node-gyp)? | boolean | true |
+| nvmInstallPath | The path where NVM will be installed. | string | /usr/local/share/nvm |
+| nvmVersion | Version of NVM to install. | string | latest |
 
 ## Customizations
 
@@ -48,9 +48,7 @@ Alternatively, you can start up an interactive shell which will in turn source `
 
 ## OS Support
 
-Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the apt, yum, dnf, or microdnf package manager installed.
-
-RedHat 7 Family (RedHat, CentOS, etc.) must use Node versions < 18.
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
 
 `bash` is required to execute the `install.sh` script.
 

src/node/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.3.1",
+    "version": "1.4.0",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -53,4 +53,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
+}

src/node/install.sh

@@ -48,12 +48,12 @@ fi
 if type apt-get > /dev/null 2>&1; then
     PKG_MGR_CMD=apt-get
     INSTALL_CMD="${PKG_MGR_CMD} -y install --no-install-recommends"
-elif type dnf > /dev/null 2>&1; then
-    PKG_MGR_CMD=dnf
-    INSTALL_CMD="${PKG_MGR_CMD} -y install"
 elif type microdnf > /dev/null 2>&1; then
     PKG_MGR_CMD=microdnf
     INSTALL_CMD="${PKG_MGR_CMD} -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+elif type dnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=dnf
+    INSTALL_CMD="${PKG_MGR_CMD} -y install"
 else
     PKG_MGR_CMD=yum
     INSTALL_CMD="${PKG_MGR_CMD} -y install"
@@ -78,23 +78,6 @@ rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
-# Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
-
 updaterc() {
     local _bashrc
     local _zshrc
@@ -152,6 +135,7 @@ pkg_mgr_update() {
 
 # Checks if packages are installed and installs them if not
 check_packages() {
+    echo "Checking packages: $@ ..."
     case ${ADJUSTED_ID} in
         debian)
             if ! dpkg -s "$@" > /dev/null 2>&1; then
@@ -204,7 +188,7 @@ find_version_from_git_tags() {
 
 install_yarn() {
     if [ "${ADJUSTED_ID}" = "debian" ]; then
-        # for backward compatiblity with devcontainer features, install yarn
+        # for backward compatiblity with existing devcontainer features, install yarn
         # via apt-get on Debian systems
         if ! type yarn >/dev/null 2>&1; then
             # Import key safely (new method rather than deprecated apt-key approach) and install
@@ -237,6 +221,30 @@ install_yarn() {
     fi
 }
 
+# Mariner does not have awk installed by default, this can cause
+# problems is username is auto* and later when we try to install
+# node via npm.
+if ! type awk >/dev/null 2>&1; then
+    check_packages awk
+fi
+
+# Determine the appropriate non-root user
+if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
+    USERNAME=""
+    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
+        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            USERNAME=${CURRENT_USER}
+            break
+        fi
+    done
+    if [ "${USERNAME}" = "" ]; then
+        USERNAME=root
+    fi
+elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
+    USERNAME=root
+fi
+
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
 
@@ -285,6 +293,10 @@ umask 0002
 # Do not update profile - we'll do this manually
 export PROFILE=/dev/null
 curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh" | bash
+
+type awk
+echo $PATH
+
 source "${NVM_DIR}/nvm.sh"
 if [ "${NODE_VERSION}" != "" ]; then
     nvm alias default "${NODE_VERSION}"

test/node/fedora.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults

test/node/install_additional_node_on_rhel_family.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# 'lts' is now some version of node 20...
+check "version_on_path"  node -v | grep 20
+check "pnpm" pnpm -v
+
+check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20
+check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
+check "v17_installed" ls -1 /usr/local/share/nvm/versions/node | grep 17.9.1
+
+
+# Report result
+reportResults

test/node/install_nvm_0.39_on_rhel_family.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" bash -c "node --version"
+check "pnpm" pnpm -v
+check "nvm version" bash -c ". /usr/local/share/nvm/nvm.sh && nvm --version | grep 0.39"
+
+# Report result
+reportResults

test/node/mariner.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+# for some reason the "nvm" test switches the default node version on Mariner
+# test yarn before that: it is only enabled in the default node version
+check "yarn" yarn --version_list
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+
+# Report result
+reportResults

test/node/rocky-8-minimal.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults

test/node/rocky-8.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults

test/node/rocky-9-minimal.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults

test/node/rocky-9.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults