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/common-utils/devcontainer-feature.json | 2 +- src/common-utils/install.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/common-utils') diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index 74b8508..812e5e9 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.5", + "version": "1.1.6", "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 878e9ca..5530b96 100755 --- a/src/common-utils/install.sh +++ b/src/common-utils/install.sh @@ -12,13 +12,13 @@ set -e # Clean up rm -rf /var/lib/apt/lists/* -INSTALL_ZSH=${INSTALLZSH:-"true"} -INSTALL_OH_MY_ZSH=${INSTALLOHMYZSH:-"true"} -UPGRADE_PACKAGES=${UPGRADEPACKAGES:-"true"} -USERNAME=${USERNAME:-"automatic"} -USER_UID=${UID:-"automatic"} -USER_GID=${GID:-"automatic"} -ADD_NON_FREE_PACKAGES=${NONFREEPACKAGES:-"false"} +INSTALL_ZSH="${INSTALLZSH:-"true"}" +INSTALL_OH_MY_ZSH="${INSTALLOHMYZSH:-"true"}" +UPGRADE_PACKAGES="${UPGRADEPACKAGES:-"true"}" +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" +USER_UID="${UID:-"automatic"}" +USER_GID="${GID:-"automatic"}" +ADD_NON_FREE_PACKAGES="${NONFREEPACKAGES:-"false"}" MARKER_FILE="/usr/local/etc/vscode-dev-containers/common" -- cgit v1.2.3