aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Lantz <clantz@microsoft.com>2022-11-29 02:07:38 +0300
committerGitHub <noreply@github.com>2022-11-29 02:07:38 +0300
commitd1972b4d8d2dc75370c236c9dafe505ea42590f2 (patch)
tree9bcd472a0fab51cb2c389f6527df5e51f22ec0b0
parent4af4c291225a165e5a9b0e5a65c450e81e5aecf0 (diff)
Use _REMOTE_USER when available (#264)
* Use _REMOTE_USER when available * Update src/python/install.sh Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com> * Update src/python/install.sh Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com> * Fix java test issue - JDK 18 not available for the "open" distro * Bump breakfix numbers Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com> Co-authored-by: Josh Spicer <joshspicer@github.com>
-rw-r--r--src/anaconda/devcontainer-feature.json2
-rwxr-xr-xsrc/anaconda/install.sh8
-rw-r--r--src/common-utils/devcontainer-feature.json2
-rwxr-xr-xsrc/common-utils/install.sh14
-rw-r--r--src/conda/devcontainer-feature.json2
-rw-r--r--src/conda/install.sh2
-rw-r--r--src/desktop-lite/devcontainer-feature.json2
-rwxr-xr-xsrc/desktop-lite/install.sh7
-rw-r--r--src/docker-from-docker/devcontainer-feature.json2
-rwxr-xr-xsrc/docker-from-docker/install.sh16
-rw-r--r--src/docker-in-docker/devcontainer-feature.json2
-rwxr-xr-xsrc/docker-in-docker/install.sh16
-rw-r--r--src/dotnet/devcontainer-feature.json2
-rw-r--r--[-rwxr-xr-x]src/dotnet/install.sh16
-rw-r--r--src/go/devcontainer-feature.json2
-rwxr-xr-xsrc/go/install.sh12
-rw-r--r--src/hugo/devcontainer-feature.json2
-rwxr-xr-xsrc/hugo/install.sh8
-rw-r--r--src/java/devcontainer-feature.json2
-rw-r--r--[-rwxr-xr-x]src/java/install.sh20
-rw-r--r--src/java/wrapper.sh10
-rw-r--r--src/kubectl-helm-minikube/devcontainer-feature.json2
-rwxr-xr-xsrc/kubectl-helm-minikube/install.sh2
-rw-r--r--src/node/devcontainer-feature.json2
-rwxr-xr-xsrc/node/install.sh8
-rwxr-xr-xsrc/oryx/install.sh4
-rw-r--r--src/php/devcontainer-feature.json2
-rwxr-xr-xsrc/php/install.sh14
-rw-r--r--src/python/devcontainer-feature.json2
-rwxr-xr-xsrc/python/install.sh22
-rw-r--r--src/ruby/devcontainer-feature.json2
-rwxr-xr-xsrc/ruby/install.sh10
-rw-r--r--src/rust/devcontainer-feature.json2
-rwxr-xr-xsrc/rust/install.sh16
-rw-r--r--src/sshd/devcontainer-feature.json2
-rwxr-xr-xsrc/sshd/install.sh10
-rw-r--r--test/java/scenarios.json2
37 files changed, 125 insertions, 126 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..53c606a 100755
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -8,10 +8,10 @@
# Maintainer: The VS Code and Codespaces Teams
-VERSION=${VERSION:-"latest"}
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
-CONDA_DIR=${CONDA_DIR:-"/usr/local/conda"}
+VERSION="${VERSION:-"latest"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
+CONDA_DIR="${CONDA_DIR:-"/usr/local/conda"}"
set -eux
export DEBIAN_FRONTEND=noninteractive
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"
diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index da4c674..8ff6499 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
{
"id": "conda",
- "version": "1.0.5",
+ "version": "1.0.6",
"name": "Conda",
"description": "A cross-platform, language-agnostic binary package manager",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 9b51bbd..6e90882 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -7,7 +7,7 @@
VERSION=${VERSION:-"latest"}
ADD_CONDA_FORGE=$ADDCONDAFORGE
-USERNAME="automatic"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
UPDATE_RC="true"
CONDA_DIR="/opt/conda"
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..60bec12 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -7,14 +7,13 @@
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/desktop-lite.md
# Maintainer: The VS Code and Codespaces Teams
-NOVNC_VERSION=${NOVNCVERSION:-"1.2.0"} # TODO: Add in a 'latest' auto-detect and swap name to 'version'
+NOVNC_VERSION="${NOVNCVERSION:-"1.2.0"}" # TODO: Add in a 'latest' auto-detect and swap name to 'version'
VNC_PASSWORD=${PASSWORD:-"vscode"}
NOVNC_PORT="${WEBPORT:-6080}"
VNC_PORT="${VNCPORT:-5901}"
-INSTALL_NOVNC=${INSTALL_NOVNC:-"true"}
-USERNAME=${USERNAME:-"automatic"}
-
+INSTALL_NOVNC="${INSTALL_NOVNC:-"true"}"
+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..1307bfc 100755
--- a/src/docker-from-docker/install.sh
+++ b/src/docker-from-docker/install.sh
@@ -7,14 +7,14 @@
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker.md
# Maintainer: The VS Code and Codespaces Teams
-DOCKER_VERSION=${VERSION:-"latest"}
-USE_MOBY=${MOBY:-"true"}
-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"}
+DOCKER_VERSION="${VERSION:-"latest"}"
+USE_MOBY="${MOBY:-"true"}"
+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:-"${_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..d351121 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -8,14 +8,14 @@
# Maintainer: The VS Code and Codespaces Teams
-DOCKER_VERSION=${VERSION:-"latest"} # The Docker/Moby Engine + CLI should match in version
-USE_MOBY=${MOBY:-"true"}
-DOCKER_DASH_COMPOSE_VERSION=${DOCKERDASHCOMPOSEVERSION:-"v1"} # v1 or v2
-AZURE_DNS_AUTO_DETECTION=${AZUREDNSAUTODETECTION:-"true"}
-DOCKER_DEFAULT_ADDRESS_POOL=${DOCKERDEFAULTADDRESSPOOL}
-
-ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"}
-USERNAME=${USERNAME:-"automatic"}
+DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
+USE_MOBY="${MOBY:-"true"}"
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2
+AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
+DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL}"
+
+ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
+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..13285ab 100755..100644
--- 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"
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..1b65e50 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -7,13 +7,13 @@
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/go.md
# Maintainer: The VS Code and Codespaces Teams
-TARGET_GO_VERSION=${VERSION:-"latest"}
-GOLANGCILINT_VERSION=${GOLANGCILINTVERSION:-"latest"}
+TARGET_GO_VERSION="${VERSION:-"latest"}"
+GOLANGCILINT_VERSION="${GOLANGCILINTVERSION:-"latest"}"
-TARGET_GOROOT=${TARGET_GOROOT:-"/usr/local/go"}
-TARGET_GOPATH=${TARGET_GOPATH:-"/go"}
-USERNAME=${USERNAME:-"automatic"}
-INSTALL_GO_TOOLS=${INSTALL_GO_TOOLS:-"true"}
+TARGET_GOROOT="${TARGET_GOROOT:-"/usr/local/go"}"
+TARGET_GOPATH="${TARGET_GOPATH:-"/go"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+INSTALL_GO_TOOLS="${INSTALL_GO_TOOLS:-"true"}"
# https://www.google.com/linuxrepositories/
GO_GPG_KEY_URI="https://dl.google.com/linux/linux_signing_key.pub"
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..b268e38 100755
--- a/src/hugo/install.sh
+++ b/src/hugo/install.sh
@@ -7,12 +7,12 @@
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/hugo.md
# Maintainer: The VS Code and Codespaces Teams
-VERSION=${VERSION:-"latest"}
+VERSION="${VERSION:-"latest"}"
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
-HUGO_DIR=${HUGO_DIR:-"/usr/local/hugo"}
+HUGO_DIR="${HUGO_DIR:-"/usr/local/hugo"}"
set -e
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..bf94963 100755..100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -9,20 +9,20 @@
#
# Syntax: ./java-debian.sh [JDK version] [SDKMAN_DIR] [non-root user] [Add to rc files flag]
-JAVA_VERSION=${VERSION:-"lts"}
-INSTALL_GRADLE=${INSTALLGRADLE:-"false"}
-GRADLE_VERSION=${GRADLEVERSION:-"latest"}
-INSTALL_MAVEN=${INSTALLMAVEN:-"false"}
-MAVEN_VERSION=${MAVENVERSION:-"latest"}
-JDK_DISTRO=${JDKDISTRO}
+JAVA_VERSION="${VERSION:-"lts"}"
+INSTALL_GRADLE="${INSTALLGRADLE:-"false"}"
+GRADLE_VERSION="${GRADLEVERSION:-"latest"}"
+INSTALL_MAVEN="${INSTALLMAVEN:-"false"}"
+MAVEN_VERSION="${MAVENVERSION:-"latest"}"
+JDK_DISTRO="${JDKDISTRO}"
-export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"}
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
+export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
# Comma-separated list of java versions to be installed
# alongside JAVA_VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
set -e
diff --git a/src/java/wrapper.sh b/src/java/wrapper.sh
index d7f05de..bea343f 100644
--- a/src/java/wrapper.sh
+++ b/src/java/wrapper.sh
@@ -3,11 +3,11 @@
set -e
-JAVA_VERSION=${1:-"default"}
-SDKMAN_DIR=${2:-"/usr/local/sdkman"}
-USERNAME=${3:-"automatic"}
-UPDATE_RC=${4:-"true"}
-ADDITIONAL_JAVA_VERSION=11
+JAVA_VERSION="${1:-"default"}"
+SDKMAN_DIR="${2:-"/usr/local/sdkman"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${4:-"true"}"
+ADDITIONAL_JAVA_VERSION="11"
cd "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
chmod +x install.sh
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..9b027d8 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -7,17 +7,17 @@
# Docs: https://github.com/devcontainers/features/tree/main/src/node
# Maintainer: The Dev Container spec maintainers
-export NODE_VERSION=${VERSION:-"lts"}
+export NODE_VERSION="${VERSION:-"lts"}"
export NVM_VERSION="${NVMVERSION:-"0.39.2"}"
export NVM_DIR=${NVMINSTALLPATH:-"/usr/local/share/nvm"}
INSTALL_TOOLS_FOR_NODE_GYP="${NODEGYPDEPENDENCIES:-true}"
# Comma-separated list of node versions to be installed (with nvm)
# alongside NODE_VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
set -e
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index aa4af2c..a1b64d3 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -5,8 +5,8 @@
#-------------------------------------------------------------------------------------------------------------
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
+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..381bec2 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -11,17 +11,17 @@ set -eux
# Clean up
rm -rf /var/lib/apt/lists/*
-VERSION=${VERSION:-"latest"}
-INSTALL_COMPOSER=${INSTALLCOMPOSER:-"true"}
-OVERRIDE_DEFAULT_VERSION=${OVERRIDEDEFAULTVERSION:-"true"}
+VERSION="${VERSION:-"latest"}"
+INSTALL_COMPOSER="${INSTALLCOMPOSER:-"true"}"
+OVERRIDE_DEFAULT_VERSION="${OVERRIDEDEFAULTVERSION:-"true"}"
-export PHP_DIR=${PHP_DIR:-"/usr/local/php"}
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
+export PHP_DIR="${PHP_DIR:-"/usr/local/php"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
# Comma-separated list of php versions to be installed
# alongside VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
export DEBIAN_FRONTEND=noninteractive
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index ca474ab..8daf3e9 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
{
"id": "python",
- "version": "1.0.16",
+ "version": "1.0.17",
"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 0c3f9e0..76fd6f0 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -7,24 +7,24 @@
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/python.md
# Maintainer: The VS Code and Codespaces Teams
-PYTHON_VERSION=${VERSION:-"latest"} # 'system' checks the base image first, else installs 'latest'
-INSTALL_PYTHON_TOOLS=${INSTALLTOOLS:-"true"}
-OPTIMIZE_BUILD_FROM_SOURCE=${OPTIMIZE:-"false"}
-PYTHON_INSTALL_PATH=${INSTALLPATH:-"/usr/local/python"}
-OVERRIDE_DEFAULT_VERSION=${OVERRIDEDEFAULTVERSION:-"true"}
+PYTHON_VERSION="${VERSION:-"latest"}" # 'system' or 'os-provided' checks the base image first, else installs 'latest'
+INSTALL_PYTHON_TOOLS="${INSTALLTOOLS:-"true"}"
+OPTIMIZE_BUILD_FROM_SOURCE="${OPTIMIZE:-"false"}"
+PYTHON_INSTALL_PATH="${INSTALLPATH:-"/usr/local/python"}"
+OVERRIDE_DEFAULT_VERSION="${OVERRIDEDEFAULTVERSION:-"true"}"
export PIPX_HOME=${PIPX_HOME:-"/usr/local/py-utils"}
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
-USE_ORYX_IF_AVAILABLE=${USEORYXIFAVAILABLE:-"true"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
+USE_ORYX_IF_AVAILABLE="${USEORYXIFAVAILABLE:-"true"}"
-INSTALL_JUPYTERLAB=${INSTALLJUPYTERLAB:-"false"}
-CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN=${CONFIGUREJUPYTERLABALLOWORIGIN:-""}
+INSTALL_JUPYTERLAB="${INSTALLJUPYTERLAB:-"false"}"
+CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN="${CONFIGUREJUPYTERLABALLOWORIGIN:-""}"
# Comma-separated list of python versions to be installed
# alongside PYTHON_VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
DEFAULT_UTILS=("pylint" "flake8" "autopep8" "black" "yapf" "mypy" "pydocstyle" "pycodestyle" "bandit" "pipenv" "virtualenv")
PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5"
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..dcf4042 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -7,15 +7,15 @@
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/ruby.md
# Maintainer: The VS Code and Codespaces Teams
-RUBY_VERSION=${VERSION:-"latest"}
+RUBY_VERSION="${VERSION:-"latest"}"
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
-INSTALL_RUBY_TOOLS=${INSTALL_RUBY_TOOLS:-"true"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
+INSTALL_RUBY_TOOLS="${INSTALL_RUBY_TOOLS:-"true"}"
# Comma-separated list of ruby versions to be installed (with rvm)
# alongside RUBY_VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
# Note: ruby-debug-ide will install the right version of debase if missing and
# installing debase directly fails on Ruby 3.1.0 as of 1/7/2022, so omitting.
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..1a30992 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -7,14 +7,14 @@
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/rust.md
# Maintainer: The VS Code and Codespaces Teams
-RUST_VERSION=${VERSION:-"latest"}
-RUSTUP_PROFILE=${PROFILE:-"minimal"}
-
-export CARGO_HOME=${CARGO_HOME:-"/usr/local/cargo"}
-export RUSTUP_HOME=${RUSTUP_HOME:-"/usr/local/rustup"}
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
-UPDATE_RUST=${UPDATE_RUST:-"false"}
+RUST_VERSION="${VERSION:-"latest"}"
+RUSTUP_PROFILE="${PROFILE:-"minimal"}"
+
+export CARGO_HOME="${CARGO_HOME:-"/usr/local/cargo"}"
+export RUSTUP_HOME="${RUSTUP_HOME:-"/usr/local/rustup"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
+UPDATE_RUST="${UPDATE_RUST:-"false"}"
set -e
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..634f163 100755
--- a/src/sshd/install.sh
+++ b/src/sshd/install.sh
@@ -9,11 +9,11 @@
#
# 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"}
-START_SSHD=${START_SSHD:-"false"}
-NEW_PASSWORD=${NEW_PASSWORD:-"skip"}
-FIX_ENVIRONMENT=${FIX_ENVIRONMENT:-"true"}
+SSHD_PORT="${SSHD_PORT:-"2222"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+START_SSHD="${START_SSHD:-"false"}"
+NEW_PASSWORD="${NEW_PASSWORD:-"skip"}"
+FIX_ENVIRONMENT="${FIX_ENVIRONMENT:-"true"}"
set -e
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index c33a0a7..479ee47 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -3,7 +3,7 @@
"image": "ubuntu:focal",
"features": {
"java": {
- "version": "11",
+ "version": "19",
"jdkDistro": "open"
}
}