From 17580ee22f38b3a16e6531a8139629fd2fd8234a Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Mon, 14 Nov 2022 11:41:32 -0800 Subject: Add .NET 7, drop .NET 5 (#269) * Add .NET 7, drop .NET 5 * Add libssl3 to common-utils for jammy * Handle lts/latest hard coding * Fix, improve tests * Bump version * Fix situation where version could come from either MS repo or OS * Remove unused option * Bump common version * Remove unused function * Restore DOTNET_ROOT per feedback --- src/common-utils/devcontainer-feature.json | 2 +- src/common-utils/install.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/common-utils') diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index c5f8621..9a135d5 100644 --- a/src/common-utils/devcontainer-feature.json +++ b/src/common-utils/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "common-utils", - "version": "1.1.3", + "version": "1.1.4", "name": "Common Debian Utilities", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils", "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.", diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh index 2d51a0b..8ac0a7c 100755 --- a/src/common-utils/install.sh +++ b/src/common-utils/install.sh @@ -140,7 +140,12 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then package_list="${package_list} libssl1.1" fi - + + # Install libssl3 if available + if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then + package_list="${package_list} libssl3" + fi + # Install appropriate version of libssl1.0.x if available libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '') if [ "$(echo "$LIlibssl_packageBSSL" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then -- cgit v1.2.3