sync with jammy updates (#21)

sync with jammy updates (https://github.com/microsoft/vscode-dev-containers/commit/053a0557211c98e5b9f0e8ccf755f6f143b05ef4) and other minor additions since copy over

1 files changed, 26 insertions, 3 deletions

diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index f560186..3dd2cc8 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -18,10 +18,12 @@ ACCESS_GROUP=${6:-"dotnet"}
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOTNET_ARCHIVE_ARCHITECTURES="amd64"
-DOTNET_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute"
+DOTNET_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute jammy"
 # Feed URI sourced from the official dotnet-install.sh
 # https://github.com/dotnet/install-scripts/blob/1b98b94a6f6d81cc4845eb88e0195fac67caa0a6/src/dotnet-install.sh#L1342-L1343
 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"
 
 # Exit on failure.
 set -e
@@ -295,7 +297,14 @@ install_using_dotnet_releases_url() {
     #         - libgcc-s1 OR libgcc1 depending on OS
     #         - the latest libicuXX depending on OS (eg libicu57 for stretch)
     #         - also installs libc6 and libstdc++6 which are required by .NET 
-    check_packages curl ca-certificates tar jq icu-devtools libgssapi-krb5-2 libssl1.1 zlib1g
+    check_packages curl ca-certificates tar jq icu-devtools libgssapi-krb5-2 zlib1g
+
+    # Starting with Ubuntu 22.04 (jammy), libssl1.1 does not ship with the OS anymore.
+    if [[  "${DOTNET_VERSION_CODENAMES_REQUIRE_OLDER_LIBSSL_1}" = *"${VERSION_CODENAME}"* ]]; then
+        check_packages libssl1.1
+    else
+        check_packages libssl3.0
+    fi
 
     get_full_version_details "${sdk_or_runtime}"
     # exports DOTNET_DOWNLOAD_URL, DOTNET_DOWNLOAD_HASH, DOTNET_DOWNLOAD_NAME
@@ -343,6 +352,18 @@ EOF
 
 export DEBIAN_FRONTEND=noninteractive
 
+# Dotnet 3.1 and 5.0 are not supported on Ubuntu 22.04 (jammy)+,
+# due to lack of libssl3.0 support.
+# See: https://github.com/microsoft/vscode-dev-containers/issues/1458#issuecomment-1135077775
+# NOTE: This will only guard against installation of the dotnet versions we propose via 'features'. 
+#       The user can attempt to install any other version at their own risk.
+if [[ "${DOTNET_VERSION}" = "3.1" ]] || [[ "${DOTNET_VERSION}" = "5.0" ]]; then
+    if [[ ! "${DOTNET_VERSION_CODENAMES_REQUIRE_OLDER_LIBSSL_1}" = *"${VERSION_CODENAME}"* ]]; then
+        err "Dotnet ${DOTNET_VERSION} is not supported on Ubuntu ${VERSION_CODENAME} due to a change in the 'libssl' dependency across distributions.\n Please upgrade your version of dotnet, or downgrade your OS version."
+        exit 1
+    fi
+fi
+
 # Determine if the user wants to download .NET Runtime only, or .NET SDK & Runtime
 # and set the appropriate variables.
 if [ "${DOTNET_RUNTIME_ONLY}" = "true" ]; then
@@ -362,13 +383,15 @@ architecture="$(dpkg --print-architecture)"
 
 use_dotnet_releases_url="false"
 if [[ "${DOTNET_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${DOTNET_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
+    echo "Detected ${VERSION_CODENAME} on ${architecture}. Attempting to install dotnet from apt"
     install_using_apt "${DOTNET_SDK_OR_RUNTIME}" || use_dotnet_releases_url="true"
 else
    use_dotnet_releases_url="true"
 fi
 
 if [ "${use_dotnet_releases_url}" = "true" ]; then
-   install_using_dotnet_releases_url "${DOTNET_SDK_OR_RUNTIME}"
+    echo "Could not install dotnet from apt. Attempting to install dotnet from releases url"
+    install_using_dotnet_releases_url "${DOTNET_SDK_OR_RUNTIME}"
 fi
 
 echo "Done!"
\ No newline at end of file