From c8383b60e06c5f46bbd8254781842d4e077034fe Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Wed, 23 Nov 2022 22:21:26 +0000 Subject: [PATCH] Features: Set USERNAME to _REMOTE_USER if available --- src/anaconda/devcontainer-feature.json | 2 +- src/anaconda/install.sh | 2 +- src/common-utils/devcontainer-feature.json | 2 +- src/common-utils/install.sh | 2 +- src/desktop-lite/devcontainer-feature.json | 2 +- src/desktop-lite/install.sh | 2 +- src/docker-from-docker/devcontainer-feature.json | 2 +- src/docker-from-docker/install.sh | 2 +- src/docker-in-docker/devcontainer-feature.json | 2 +- src/docker-in-docker/install.sh | 2 +- src/dotnet/devcontainer-feature.json | 2 +- src/dotnet/install.sh | 2 +- src/go/devcontainer-feature.json | 2 +- src/go/install.sh | 2 +- src/hugo/devcontainer-feature.json | 2 +- src/hugo/install.sh | 2 +- src/java/devcontainer-feature.json | 2 +- src/java/install.sh | 2 +- src/kubectl-helm-minikube/devcontainer-feature.json | 2 +- src/kubectl-helm-minikube/install.sh | 2 +- src/node/devcontainer-feature.json | 2 +- src/node/install.sh | 2 +- src/oryx/devcontainer-feature.json | 2 +- src/oryx/install.sh | 2 +- src/php/devcontainer-feature.json | 2 +- src/php/install.sh | 2 +- src/python/devcontainer-feature.json | 2 +- src/python/install.sh | 2 +- src/ruby/devcontainer-feature.json | 2 +- src/ruby/install.sh | 2 +- src/rust/devcontainer-feature.json | 2 +- src/rust/install.sh | 2 +- src/sshd/devcontainer-feature.json | 2 +- src/sshd/install.sh | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json index 7308699..cdf1fbf 100644 --- a/src/anaconda/devcontainer-feature.json +++ b/src/anaconda/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "anaconda", - "version": "1.0.9", + "version": "1.0.10", "name": "Anaconda", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda", "options": { diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh index 47f3462..07661d4 100755 --- a/src/anaconda/install.sh +++ b/src/anaconda/install.sh @@ -9,7 +9,7 @@ VERSION=${VERSION:-"latest"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" UPDATE_RC=${UPDATE_RC:-"true"} CONDA_DIR=${CONDA_DIR:-"/usr/local/conda"} diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index 9a135d5..74b8508 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.4", + "version": "1.1.5", "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 8ac0a7c..ed29ade 100755 --- a/src/common-utils/install.sh +++ b/src/common-utils/install.sh @@ -15,7 +15,7 @@ rm -rf /var/lib/apt/lists/* INSTALL_ZSH=${INSTALLZSH:-"true"} INSTALL_OH_MY_ZSH=${INSTALLOHMYZSH:-"true"} UPGRADE_PACKAGES=${UPGRADEPACKAGES:-"true"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" USER_UID=${UID:-"automatic"} USER_GID=${GID:-"automatic"} ADD_NON_FREE_PACKAGES=${NONFREEPACKAGES:-"false"} diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json index 9420dc3..e033386 100644 --- a/src/desktop-lite/devcontainer-feature.json +++ b/src/desktop-lite/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "desktop-lite", - "version": "1.0.5", + "version": "1.0.6", "name": "Light-weight Desktop", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite", "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.", diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh index dc8ee39..befab40 100755 --- a/src/desktop-lite/install.sh +++ b/src/desktop-lite/install.sh @@ -13,7 +13,7 @@ NOVNC_PORT="${WEBPORT:-6080}" VNC_PORT="${VNCPORT:-5901}" INSTALL_NOVNC=${INSTALL_NOVNC:-"true"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" WEBSOCKETIFY_VERSION=0.10.0 diff --git a/src/docker-from-docker/devcontainer-feature.json b/src/docker-from-docker/devcontainer-feature.json index dc72089..2ebdd38 100644 --- a/src/docker-from-docker/devcontainer-feature.json +++ b/src/docker-from-docker/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "docker-from-docker", - "version": "1.0.6", + "version": "1.0.7", "name": "Docker (Docker-from-Docker)", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-from-docker", "descripton": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.", diff --git a/src/docker-from-docker/install.sh b/src/docker-from-docker/install.sh index d128ab9..ede83f0 100755 --- a/src/docker-from-docker/install.sh +++ b/src/docker-from-docker/install.sh @@ -14,7 +14,7 @@ DOCKER_DASH_COMPOSE_VERSION=${DOCKERDASHCOMPOSEVERSION:-"v1"} # v1 or v2 ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"} SOURCE_SOCKET=${SOURCE_SOCKET:-"/var/run/docker-host.sock"} TARGET_SOCKET=${TARGET_SOCKET:-"/var/run/docker.sock"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc" DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy" diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json index 95a6a2c..95d6841 100644 --- a/src/docker-in-docker/devcontainer-feature.json +++ b/src/docker-in-docker/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "docker-in-docker", - "version": "1.0.8", + "version": "1.0.9", "name": "Docker (Docker-in-Docker)", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker", "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.", diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh index fe4692f..f39685f 100755 --- a/src/docker-in-docker/install.sh +++ b/src/docker-in-docker/install.sh @@ -15,7 +15,7 @@ AZURE_DNS_AUTO_DETECTION=${AZUREDNSAUTODETECTION:-"true"} DOCKER_DEFAULT_ADDRESS_POOL=${DOCKERDEFAULTADDRESSPOOL} ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc" DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy" 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 index 78cd691..37ffb08 100755 --- a/src/dotnet/install.sh +++ b/src/dotnet/install.sh @@ -15,7 +15,7 @@ INSTALL_USING_APT=${INSTALLUSINGAPT:-"true"} DOTNET_LATEST="7" DOTNET_LTS="6" -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" UPDATE_RC=${UPDATE_RC:-"true"} TARGET_DOTNET_ROOT=${TARGET_DOTNET_ROOT:-"/usr/local/dotnet"} ACCESS_GROUP=${ACCESS_GROUP:-"dotnet"} diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json index b2aa30b..f63d93e 100644 --- a/src/go/devcontainer-feature.json +++ b/src/go/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "go", - "version": "1.1.1", + "version": "1.1.2", "name": "Go", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go", "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.", diff --git a/src/go/install.sh b/src/go/install.sh index 844411f..068a95d 100755 --- a/src/go/install.sh +++ b/src/go/install.sh @@ -12,7 +12,7 @@ GOLANGCILINT_VERSION=${GOLANGCILINTVERSION:-"latest"} TARGET_GOROOT=${TARGET_GOROOT:-"/usr/local/go"} TARGET_GOPATH=${TARGET_GOPATH:-"/go"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" INSTALL_GO_TOOLS=${INSTALL_GO_TOOLS:-"true"} # https://www.google.com/linuxrepositories/ diff --git a/src/hugo/devcontainer-feature.json b/src/hugo/devcontainer-feature.json index 37a805d..ffc1a3b 100644 --- a/src/hugo/devcontainer-feature.json +++ b/src/hugo/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "hugo", - "version": "1.1.0", + "version": "1.1.1", "name": "Hugo", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/hugo", "options": { diff --git a/src/hugo/install.sh b/src/hugo/install.sh index c5cb628..7b69684 100755 --- a/src/hugo/install.sh +++ b/src/hugo/install.sh @@ -9,7 +9,7 @@ VERSION=${VERSION:-"latest"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" UPDATE_RC=${UPDATE_RC:-"true"} HUGO_DIR=${HUGO_DIR:-"/usr/local/hugo"} diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json index c400fb6..4c7df03 100644 --- a/src/java/devcontainer-feature.json +++ b/src/java/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "java", - "version": "1.1.0", + "version": "1.1.1", "name": "Java (via SDKMAN!)", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java", "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.", diff --git a/src/java/install.sh b/src/java/install.sh index 5928478..208f4d6 100755 --- a/src/java/install.sh +++ b/src/java/install.sh @@ -17,7 +17,7 @@ MAVEN_VERSION=${MAVENVERSION:-"latest"} JDK_DISTRO=${JDKDISTRO} export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" UPDATE_RC=${UPDATE_RC:-"true"} # Comma-separated list of java versions to be installed diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json index f8098b4..beea80a 100644 --- a/src/kubectl-helm-minikube/devcontainer-feature.json +++ b/src/kubectl-helm-minikube/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "kubectl-helm-minikube", - "version": "1.1.0", + "version": "1.1.1", "name": "Kubectl, Helm, and Minikube", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube", "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.", diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh index c961e56..3ab6535 100755 --- a/src/kubectl-helm-minikube/install.sh +++ b/src/kubectl-helm-minikube/install.sh @@ -19,7 +19,7 @@ MINIKUBE_VERSION="${MINIKUBE:-"none"}" # latest is also valid KUBECTL_SHA256="${KUBECTL_SHA256:-"automatic"}" HELM_SHA256="${HELM_SHA256:-"automatic"}" MINIKUBE_SHA256="${MINIKUBE_SHA256:-"automatic"}" -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS" GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80 diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json index 49d2160..3abfb04 100644 --- a/src/node/devcontainer-feature.json +++ b/src/node/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "node", - "version": "1.1.2", + "version": "1.1.3", "name": "Node.js (via nvm) and yarn", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node", "description": "Installs Node.js, nvm, yarn, and needed dependencies.", diff --git a/src/node/install.sh b/src/node/install.sh index 2f2e7aa..978b83e 100755 --- a/src/node/install.sh +++ b/src/node/install.sh @@ -16,7 +16,7 @@ INSTALL_TOOLS_FOR_NODE_GYP="${NODEGYPDEPENDENCIES:-true}" # alongside NODE_VERSION, but not set as default. ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" UPDATE_RC=${UPDATE_RC:-"true"} set -e diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json index 5c64344..9a6bd25 100644 --- a/src/oryx/devcontainer-feature.json +++ b/src/oryx/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "oryx", - "version": "1.0.12", + "version": "1.0.13", "name": "Oryx", "description": "Installs the oryx CLI", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx", diff --git a/src/oryx/install.sh b/src/oryx/install.sh index aa4af2c..3ff8da9 100755 --- a/src/oryx/install.sh +++ b/src/oryx/install.sh @@ -5,7 +5,7 @@ #------------------------------------------------------------------------------------------------------------- -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" UPDATE_RC=${UPDATE_RC:-"true"} MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc" diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json index 181851e..bad9878 100644 --- a/src/php/devcontainer-feature.json +++ b/src/php/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "php", - "version": "1.0.8", + "version": "1.0.9", "name": "PHP", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php", "options": { diff --git a/src/php/install.sh b/src/php/install.sh index 70b63da..f922a69 100755 --- a/src/php/install.sh +++ b/src/php/install.sh @@ -16,7 +16,7 @@ INSTALL_COMPOSER=${INSTALLCOMPOSER:-"true"} OVERRIDE_DEFAULT_VERSION=${OVERRIDEDEFAULTVERSION:-"true"} export PHP_DIR=${PHP_DIR:-"/usr/local/php"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" UPDATE_RC=${UPDATE_RC:-"true"} # Comma-separated list of php versions to be installed diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json index b96511b..ca474ab 100644 --- a/src/python/devcontainer-feature.json +++ b/src/python/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "python", - "version": "1.0.15", + "version": "1.0.16", "name": "Python", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python", "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities. JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.", diff --git a/src/python/install.sh b/src/python/install.sh index d823cc9..2c4792a 100755 --- a/src/python/install.sh +++ b/src/python/install.sh @@ -15,7 +15,7 @@ OVERRIDE_DEFAULT_VERSION=${OVERRIDEDEFAULTVERSION:-"true"} export PIPX_HOME=${PIPX_HOME:-"/usr/local/py-utils"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" UPDATE_RC=${UPDATE_RC:-"true"} USE_ORYX_IF_AVAILABLE=${USEORYXIFAVAILABLE:-"true"} diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json index c76d85d..e11c172 100644 --- a/src/ruby/devcontainer-feature.json +++ b/src/ruby/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "ruby", - "version": "1.0.6", + "version": "1.0.7", "name": "Ruby (via rvm)", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby", "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.", diff --git a/src/ruby/install.sh b/src/ruby/install.sh index 2228522..bf2cbbe 100755 --- a/src/ruby/install.sh +++ b/src/ruby/install.sh @@ -9,7 +9,7 @@ RUBY_VERSION=${VERSION:-"latest"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" UPDATE_RC=${UPDATE_RC:-"true"} INSTALL_RUBY_TOOLS=${INSTALL_RUBY_TOOLS:-"true"} diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json index 2dca581..8a7f5b4 100644 --- a/src/rust/devcontainer-feature.json +++ b/src/rust/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "rust", - "version": "1.0.8", + "version": "1.0.9", "name": "Rust", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust", "description": "Installs Rust, common Rust utilities, and their required dependencies", diff --git a/src/rust/install.sh b/src/rust/install.sh index e7cfb71..71d337f 100755 --- a/src/rust/install.sh +++ b/src/rust/install.sh @@ -12,7 +12,7 @@ RUSTUP_PROFILE=${PROFILE:-"minimal"} export CARGO_HOME=${CARGO_HOME:-"/usr/local/cargo"} export RUSTUP_HOME=${RUSTUP_HOME:-"/usr/local/rustup"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" UPDATE_RC=${UPDATE_RC:-"true"} UPDATE_RUST=${UPDATE_RUST:-"false"} diff --git a/src/sshd/devcontainer-feature.json b/src/sshd/devcontainer-feature.json index 6433f3f..b8b7bad 100644 --- a/src/sshd/devcontainer-feature.json +++ b/src/sshd/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "sshd", - "version": "1.0.5", + "version": "1.0.6", "name": "SSH server", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd", "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.", diff --git a/src/sshd/install.sh b/src/sshd/install.sh index a93b927..1fbaa8d 100755 --- a/src/sshd/install.sh +++ b/src/sshd/install.sh @@ -10,7 +10,7 @@ # Note: You can change your user's password with "sudo passwd $(whoami)" (or just "passwd" if running as root). SSHD_PORT=${SSHD_PORT:-"2222"} -USERNAME=${USERNAME:-"automatic"} +USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" START_SSHD=${START_SSHD:-"false"} NEW_PASSWORD=${NEW_PASSWORD:-"skip"} FIX_ENVIRONMENT=${FIX_ENVIRONMENT:-"true"}