Merge branch 'main' into samruddhikhandale/php-multiple-install

Author: samruddhikhandale

src/dotnet/devcontainer-feature.json

@@ -36,9 +36,5 @@
     },
     "extensions": [
         "ms-dotnettools.csharp"
-    ],
-    "install": {
-        "app": "",
-        "file": "install.sh"
-    }
-}
+    ]
+}

src/dotnet/install.sh

@@ -26,6 +26,10 @@ DOTNET_CDN_FEED_URI="https://dotnetcli.azureedge.net"
 # Ubuntu 22.04 and on do not ship with libssl1.1, which is required for versions of .NET < 6.0
 DOTNET_VERSION_CODENAMES_REQUIRE_OLDER_LIBSSL_1="buster bullseye bionic focal hirsute"
 
+# Comma-separated list of dotnet versions to be installed
+# alongside DOTNET_VERSION, but not set as default.
+ADDITIONAL_VERSIONS=${ADDITIONAL_VERSIONS:-""}
+
 # Exit on failure.
 set -e
 
@@ -235,6 +239,7 @@ install_using_apt() {
 # DOTNET_DOWNLOAD_NAME
 get_full_version_details() {
     local sdk_or_runtime="$1"
+    local VERSION="$2"
     local architecture
     local dotnet_channel_version
     local dotnet_releases_url
@@ -249,12 +254,12 @@ get_full_version_details() {
     # Set architecture variable to current user's architecture (x64 or ARM64).
     architecture="$(get_architecture_name_for_target_os)"
 
-    # Set DOTNET_VERSION to empty string to ensure jq includes all .NET versions in reverse sort below 
-    if [ "${DOTNET_VERSION}" = "latest" ]; then
-        DOTNET_VERSION=""
+    # Set VERSION to empty string to ensure jq includes all .NET versions in reverse sort below 
+    if [ "${VERSION}" = "latest" ]; then
+        VERSION=""
     fi
 
-    dotnet_patchless_version="$(echo "${DOTNET_VERSION}" | cut -d "." --field=1,2)"
+    dotnet_patchless_version="$(echo "${VERSION}" | cut -d "." --field=1,2)"
 
     set +e
     dotnet_channel_version="$(curl -s "${DOTNET_CDN_FEED_URI}/dotnet/release-metadata/releases-index.json" | jq -r --arg channel_version "${dotnet_patchless_version}" '[."releases-index"[]] | sort_by(."channel-version") | reverse | map( select(."channel-version" | startswith($channel_version))) | first | ."channel-version"')"
@@ -274,29 +279,30 @@ get_full_version_details() {
     if [ -n "${dotnet_releases_json}" ] && [[ ! "${dotnet_releases_json}" = *"Error"* ]]; then
         dotnet_latest_version="$(echo "${dotnet_releases_json}" | jq -r --arg sdk_or_runtime "${sdk_or_runtime}" '."latest-\($sdk_or_runtime)"')"
         # If user-specified version has 2 or more dots, use it as is.  Otherwise use latest version.
-        if [ "$(echo "${DOTNET_VERSION}" | grep -o "\." | wc -l)" -lt "2" ]; then
-            DOTNET_VERSION="${dotnet_latest_version}"
+        if [ "$(echo "${VERSION}" | grep -o "\." | wc -l)" -lt "2" ]; then
+            VERSION="${dotnet_latest_version}"
         fi
 
-        dotnet_download_details="$(echo "${dotnet_releases_json}" |  jq -r --arg sdk_or_runtime "${sdk_or_runtime}" --arg dotnet_version "${DOTNET_VERSION}" --arg arch "${architecture}" '.releases[]."\($sdk_or_runtime)" | select(.version==$dotnet_version) | .files[] | select(.name=="dotnet-\($sdk_or_runtime)-linux-\($arch).tar.gz")')"
+        dotnet_download_details="$(echo "${dotnet_releases_json}" |  jq -r --arg sdk_or_runtime "${sdk_or_runtime}" --arg dotnet_version "${VERSION}" --arg arch "${architecture}" '.releases[]."\($sdk_or_runtime)" | select(.version==$dotnet_version) | .files[] | select(.name=="dotnet-\($sdk_or_runtime)-linux-\($arch).tar.gz")')"
         if [ -n "${dotnet_download_details}" ]; then
-            echo "Found .NET binary version ${DOTNET_VERSION}"
+            echo "Found .NET binary version ${VERSION}"
             DOTNET_DOWNLOAD_URL="$(echo "${dotnet_download_details}" | jq -r '.url')"
             DOTNET_DOWNLOAD_HASH="$(echo "${dotnet_download_details}" | jq -r '.hash')"
             DOTNET_DOWNLOAD_NAME="$(echo "${dotnet_download_details}" | jq -r '.name')"
         else
-            err "Unable to find .NET binary for version ${DOTNET_VERSION}"
+            err "Unable to find .NET binary for version ${VERSION}"
             exit 1
         fi
     else
-        err "Unable to find .NET release details for version ${DOTNET_VERSION} at ${dotnet_releases_url}"
+        err "Unable to find .NET release details for version ${VERSION} at ${dotnet_releases_url}"
         exit 1
     fi
 }
 
 # Install .NET CLI using the .NET releases url
 install_using_dotnet_releases_url() {
     local sdk_or_runtime="$1"
+    local VERSION="$2"
 
     # Check listed package dependecies and install them if they are not already installed. 
     # NOTE: icu-devtools is a small package with similar dependecies to .NET. 
@@ -313,11 +319,11 @@ install_using_dotnet_releases_url() {
         check_packages libssl3.0
     fi
 
-    get_full_version_details "${sdk_or_runtime}"
+    get_full_version_details "${sdk_or_runtime}" "${VERSION}"
 
-    DOTNET_INSTALL_PATH="${TARGET_DOTNET_ROOT}/${DOTNET_VERSION}"
+    DOTNET_INSTALL_PATH="${TARGET_DOTNET_ROOT}/${VERSION}"
     if [ -d "${DOTNET_INSTALL_PATH}" ]; then
-        echo "(!) Dotnet version ${DOTNET_VERSION} already exists."
+        echo "(!) Dotnet version ${VERSION} already exists."
         exit 1
     fi
     # exports DOTNET_DOWNLOAD_URL, DOTNET_DOWNLOAD_HASH, DOTNET_DOWNLOAD_NAME
@@ -402,6 +408,7 @@ echo "(*) Installing .NET CLI..."
 . /etc/os-release
 architecture="$(dpkg --print-architecture)"
 
+CHANGE_OWNERSHIP="false"
 if [[ "${DOTNET_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${DOTNET_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]] && [[ "${INSTALL_USING_APT}" = "true" ]]; then
     echo "Detected ${VERSION_CODENAME} on ${architecture}. Attempting to install dotnet from apt"
     install_using_apt "${DOTNET_SDK_OR_RUNTIME}"
@@ -411,17 +418,31 @@ else
     else
         echo "Could not install dotnet from apt. Attempting to install dotnet from releases url"
     fi
+    install_using_dotnet_releases_url "${DOTNET_SDK_OR_RUNTIME}" "${DOTNET_VERSION}"
+    CHANGE_OWNERSHIP="true"
+fi
 
+# Additional dotnet versions to be installed but not be set as default.
+if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
+    OLDIFS=$IFS
+    IFS=","
+        read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
+        for version in "${additional_versions[@]}"; do
+            OVERRIDE_DEFAULT_VERSION="false"
+            install_using_dotnet_releases_url "${DOTNET_SDK_OR_RUNTIME}" "${version}"
+        done
+    IFS=$OLDIFS
+fi
+
+if [ "${CHANGE_OWNERSHIP}" = "true" ]; then
     if ! cat /etc/group | grep -e "^dotnet:" > /dev/null 2>&1; then
         groupadd -r dotnet
     fi
     usermod -a -G dotnet "${USERNAME}"
 
-    install_using_dotnet_releases_url "${DOTNET_SDK_OR_RUNTIME}"
-    
     chown -R "${USERNAME}:dotnet" "${TARGET_DOTNET_ROOT}"
     chmod -R g+r+w "${TARGET_DOTNET_ROOT}"
     find "${TARGET_DOTNET_ROOT}" -type d | xargs -n 1 chmod g+s
 fi
 
-echo "Done!"
+echo "Done!"

src/java/devcontainer-feature.json

@@ -27,9 +27,5 @@
   },
   "settings": {
     "java.import.gradle.java.home": "/usr/local/sdkman/candidates/java/current"
-  },
-  "install": {
-    "app": "",
-    "file": "install.sh"
   }
-}
+}

src/java/install.sh

@@ -15,6 +15,10 @@ export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"}
 USERNAME=${USERNAME:-"automatic"}
 UPDATE_RC=${UPDATE_RC:-"true"}
 
+# Comma-separated list of java versions to be installed
+# alongside JAVA_VERSION, but not set as default.
+ADDITIONAL_VERSIONS=${ADDITIONAL_VERSIONS:-""}
+
 set -e
 
 if [ "$(id -u)" -ne 0 ]; then
@@ -75,13 +79,23 @@ check_packages() {
     fi
 }
 
+# Use Microsoft JDK for everything but JDK 8
+jdk_distro="ms"
+get_jdk_distro() {
+    VERSION="$1"
+    if echo "${VERSION}" | grep -E '^8([\s\.]|$)' > /dev/null 2>&1; then
+        jdk_distro="tem"
+    fi
+}
+
 # Use SDKMAN to install something using a partial version match
 sdk_install() {
     local install_type=$1
     local requested_version=$2
     local prefix=$3
     local suffix="${4:-"\\s*"}"
     local full_version_check=${5:-".*-[a-z]+"}
+    local set_as_default=${6:-"true"}
     if [ "${requested_version}" = "none" ]; then return; fi
     # Blank will install latest stable version SDKMAN has
     if [ "${requested_version}" = "lts" ] || [ "${requested_version}" = "default" ]; then
@@ -90,7 +104,7 @@ sdk_install() {
         echo "${requested_version}"
     else
         local regex="${prefix}\\K[0-9]+\\.[0-9]+\\.[0-9]+${suffix}"
-        local version_list="$(. ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} 2>&1 | grep -oP "${regex}" | tr -d ' ' | sort -rV)"
+        local version_list=$(su ${USERNAME} -c ". \${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} 2>&1 | grep -oP \"${regex}\" | tr -d ' ' | sort -rV")
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ]; then
             requested_version="$(echo "${version_list}" | head -n 1)"
         else
@@ -103,6 +117,10 @@ sdk_install() {
             exit 1
         fi
     fi
+    if [ "${set_as_default}" = "true" ]; then
+        JAVA_VERSION=${requested_version}
+    fi
+
     su ${USERNAME} -c "umask 0002 && . ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk install ${install_type} ${requested_version} && sdk flush archives && sdk flush temp"
 }
 
@@ -133,14 +151,20 @@ if [ ! -d "${SDKMAN_DIR}" ]; then
     updaterc "export SDKMAN_DIR=${SDKMAN_DIR}\n. \${SDKMAN_DIR}/bin/sdkman-init.sh"
 fi
 
-# Use Microsoft JDK for everything but JDK 8
-jdk_distro="ms"
-if echo "${JAVA_VERSION}" | grep -E '^8([\s\.]|$)' > /dev/null 2>&1; then
-    jdk_distro="tem"
-fi
-if [ "${JAVA_VERSION}" = "lts" ]; then
-    JAVA_VERSION="17"
+get_jdk_distro ${JAVA_VERSION}
+sdk_install java ${JAVA_VERSION} "\\s*" "(\\.[a-z0-9]+)*-${jdk_distro}\\s*" ".*-[a-z]+$" "true"
+
+# Additional java versions to be installed but not be set as default.
+if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
+    OLDIFS=$IFS
+    IFS=","
+        read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
+        for version in "${additional_versions[@]}"; do
+            get_jdk_distro ${version}
+            sdk_install java ${version} "\\s*" "(\\.[a-z0-9]+)*-${jdk_distro}\\s*" ".*-[a-z]+$" "false"
+        done
+    IFS=$OLDIFS
+    su ${USERNAME} -c ". ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk default java ${JAVA_VERSION}"
 fi
-sdk_install java ${JAVA_VERSION} "\\s*" "(\\.[a-z0-9]+)*-${jdk_distro}\\s*" ".*-[a-z]+$"
 
-echo "Done!"
+echo "Done!"

test-scenarios/install_additional_dotnet.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet version 6.0.301 installed as default" dotnet --version | grep 6.0.301
+check "dotnet version 5.0 installed"  ls -l /usr/local/dotnet | grep 5.0
+check "dotnet version 3.1.420 installed"  ls -l /usr/local/dotnet | grep 3.1.420
+
+# Report result
+reportResults

test-scenarios/install_additional_java.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "java version 17 installed as default" java --version | grep 17
+check "java version 11 installed"  ls /usr/local/sdkman/candidates/java  | grep 11
+check "java version 8 installed"  ls /usr/local/sdkman/candidates/java | grep 8
+
+# Report result
+reportResults

test-scenarios/scenarios.json

@@ -5,6 +5,15 @@
             "php": {
                 "version": "8.1.4",
                 "additional_versions": "8.0.17,8.0.3"
+             }
+         }
+     },
+    "install_additional_java": {
+        "image": "ubuntu:focal",
+        "features": {
+            "java": {
+                "version": "17",
+                "additional_versions": "11,8"
             }
         }
     },
@@ -47,5 +56,14 @@
                 "additional_versions": "2.5,3.0.4"
             }
         }
+    },
+    "install_additional_dotnet": {
+        "image": "ubuntu:focal",
+        "features": {
+            "dotnet": {
+                "version": "6.0.301",
+                "additional_versions": "5.0,3.1.420"
+            }
+        }
     }
 }