From d1972b4d8d2dc75370c236c9dafe505ea42590f2 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Mon, 28 Nov 2022 17:07:38 -0600 Subject: Use _REMOTE_USER when available (#264) * Use _REMOTE_USER when available * Update src/python/install.sh Co-authored-by: Samruddhi Khandale * Update src/python/install.sh Co-authored-by: Samruddhi Khandale * Fix java test issue - JDK 18 not available for the "open" distro * Bump breakfix numbers Co-authored-by: Samruddhi Khandale Co-authored-by: Josh Spicer --- src/dotnet/devcontainer-feature.json | 2 +- src/dotnet/install.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) mode change 100755 => 100644 src/dotnet/install.sh (limited to 'src/dotnet') diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json index 42eb1c2..e8bb9f1 100644 --- a/src/dotnet/devcontainer-feature.json +++ b/src/dotnet/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "dotnet", - "version": "1.1.0", + "version": "1.1.1", "name": "Dotnet CLI", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet", "description": "Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.", diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh old mode 100755 new mode 100644 index 78cd691..13285ab --- a/src/dotnet/install.sh +++ b/src/dotnet/install.sh @@ -7,18 +7,18 @@ # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/dotnet.md # Maintainer: The VS Code and Codespaces Teams -DOTNET_VERSION=${VERSION:-"latest"} -DOTNET_RUNTIME_ONLY=${RUNTIMEONLY:-"false"} -OVERRIDE_DEFAULT_VERSION=${OVERRIDEDEFAULTVERSION:-"true"} -INSTALL_USING_APT=${INSTALLUSINGAPT:-"true"} +DOTNET_VERSION="${VERSION:-"latest"}" +DOTNET_RUNTIME_ONLY="${RUNTIMEONLY:-"false"}" +OVERRIDE_DEFAULT_VERSION="${OVERRIDEDEFAULTVERSION:-"true"}" +INSTALL_USING_APT="${INSTALLUSINGAPT:-"true"}" DOTNET_LATEST="7" DOTNET_LTS="6" -USERNAME=${USERNAME:-"automatic"} -UPDATE_RC=${UPDATE_RC:-"true"} -TARGET_DOTNET_ROOT=${TARGET_DOTNET_ROOT:-"/usr/local/dotnet"} -ACCESS_GROUP=${ACCESS_GROUP:-"dotnet"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" +UPDATE_RC="${UPDATE_RC:-"true"}" +TARGET_DOTNET_ROOT="${TARGET_DOTNET_ROOT:-"/usr/local/dotnet"}" +ACCESS_GROUP="${ACCESS_GROUP:-"dotnet"}" MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc" DOTNET_ARCHIVE_ARCHITECTURES="amd64" -- cgit v1.2.3