Skip to content

Commit ee10752

Browse files
ChuxelChuxel
authored
Use _REMOTE_USER when available
1 parent 3020d6d commit ee10752

19 files changed

Lines changed: 106 additions & 107 deletions

File tree

‎src/anaconda/install.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
# Maintainer: The VS Code and Codespaces Teams
99

1010

11-
VERSION=${VERSION:-"latest"}
12-
USERNAME=${USERNAME:-"automatic"}
13-
UPDATE_RC=${UPDATE_RC:-"true"}
14-
CONDA_DIR=${CONDA_DIR:-"/usr/local/conda"}
11+
VERSION="${VERSION:-"latest"}"
12+
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
13+
UPDATE_RC="${UPDATE_RC:-"true"}"
14+
CONDA_DIR="${CONDA_DIR:-"/usr/local/conda"}"
1515

1616
set -eux
1717
export DEBIAN_FRONTEND=noninteractive

‎src/common-utils/install.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ set -e
1212
# Clean up
1313
rm -rf /var/lib/apt/lists/*
1414

15-
INSTALL_ZSH=${INSTALLZSH:-"true"}
16-
INSTALL_OH_MY_ZSH=${INSTALLOHMYZSH:-"true"}
17-
UPGRADE_PACKAGES=${UPGRADEPACKAGES:-"true"}
18-
USERNAME=${USERNAME:-"automatic"}
19-
USER_UID=${UID:-"automatic"}
20-
USER_GID=${GID:-"automatic"}
21-
ADD_NON_FREE_PACKAGES=${NONFREEPACKAGES:-"false"}
15+
INSTALL_ZSH="${INSTALLZSH:-"true"}"
16+
INSTALL_OH_MY_ZSH="${INSTALLOHMYZSH:-"true"}"
17+
UPGRADE_PACKAGES="${UPGRADEPACKAGES:-"true"}"
18+
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
19+
USER_UID="${UID:-"automatic"}"
20+
USER_GID="${GID:-"automatic"}"
21+
ADD_NON_FREE_PACKAGES="${NONFREEPACKAGES:-"false"}"
2222

2323
MARKER_FILE="/usr/local/etc/vscode-dev-containers/common"
2424

‎src/conda/install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
VERSION=${VERSION:-"latest"}
88
ADD_CONDA_FORGE=$ADDCONDAFORGE
99

10-
USERNAME="automatic"
10+
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
1111
UPDATE_RC="true"
1212
CONDA_DIR="/opt/conda"
1313

‎src/desktop-lite/install.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/desktop-lite.md
88
# Maintainer: The VS Code and Codespaces Teams
99

10-
NOVNC_VERSION=${NOVNCVERSION:-"1.2.0"} # TODO: Add in a 'latest' auto-detect and swap name to 'version'
10+
NOVNC_VERSION="${NOVNCVERSION:-"1.2.0"}" # TODO: Add in a 'latest' auto-detect and swap name to 'version'
1111
VNC_PASSWORD=${PASSWORD:-"vscode"}
1212
NOVNC_PORT="${WEBPORT:-6080}"
1313
VNC_PORT="${VNCPORT:-5901}"
1414

15-
INSTALL_NOVNC=${INSTALL_NOVNC:-"true"}
16-
USERNAME=${USERNAME:-"automatic"}
17-
15+
INSTALL_NOVNC="${INSTALL_NOVNC:-"true"}"
16+
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
1817

1918
WEBSOCKETIFY_VERSION=0.10.0
2019

‎src/docker-from-docker/install.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker.md
88
# Maintainer: The VS Code and Codespaces Teams
99

10-
DOCKER_VERSION=${VERSION:-"latest"}
11-
USE_MOBY=${MOBY:-"true"}
12-
DOCKER_DASH_COMPOSE_VERSION=${DOCKERDASHCOMPOSEVERSION:-"v1"} # v1 or v2
13-
14-
ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"}
15-
SOURCE_SOCKET=${SOURCE_SOCKET:-"/var/run/docker-host.sock"}
16-
TARGET_SOCKET=${TARGET_SOCKET:-"/var/run/docker.sock"}
17-
USERNAME=${USERNAME:-"automatic"}
10+
DOCKER_VERSION="${VERSION:-"latest"}"
11+
USE_MOBY="${MOBY:-"true"}"
12+
DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2
13+
14+
ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
15+
SOURCE_SOCKET="${SOURCE_SOCKET:-"/var/run/docker-host.sock"}"
16+
TARGET_SOCKET="${TARGET_SOCKET:-"/var/run/docker.sock"}"
17+
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
1818

1919
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
2020
DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"

‎src/docker-in-docker/install.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
# Maintainer: The VS Code and Codespaces Teams
99

1010

11-
DOCKER_VERSION=${VERSION:-"latest"} # The Docker/Moby Engine + CLI should match in version
12-
USE_MOBY=${MOBY:-"true"}
13-
DOCKER_DASH_COMPOSE_VERSION=${DOCKERDASHCOMPOSEVERSION:-"v1"} # v1 or v2
14-
AZURE_DNS_AUTO_DETECTION=${AZUREDNSAUTODETECTION:-"true"}
15-
DOCKER_DEFAULT_ADDRESS_POOL=${DOCKERDEFAULTADDRESSPOOL}
16-
17-
ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"}
18-
USERNAME=${USERNAME:-"automatic"}
11+
DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
12+
USE_MOBY="${MOBY:-"true"}"
13+
DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2
14+
AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
15+
DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL}"
16+
17+
ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
18+
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
1919

2020
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
2121
DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"

‎src/dotnet/install.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/dotnet.md
88
# Maintainer: The VS Code and Codespaces Teams
99

10-
DOTNET_VERSION=${VERSION:-"latest"}
11-
DOTNET_RUNTIME_ONLY=${RUNTIMEONLY:-"false"}
12-
OVERRIDE_DEFAULT_VERSION=${OVERRIDEDEFAULTVERSION:-"true"}
13-
INSTALL_USING_APT=${INSTALLUSINGAPT:-"true"}
14-
15-
USERNAME=${USERNAME:-"automatic"}
16-
UPDATE_RC=${UPDATE_RC:-"true"}
17-
TARGET_DOTNET_ROOT=${TARGET_DOTNET_ROOT:-"/usr/local/dotnet"}
18-
ACCESS_GROUP=${ACCESS_GROUP:-"dotnet"}
10+
DOTNET_VERSION="${VERSION:-"latest"}"
11+
DOTNET_RUNTIME_ONLY="${RUNTIMEONLY:-"false"}"
12+
OVERRIDE_DEFAULT_VERSION="${OVERRIDEDEFAULTVERSION:-"true"}"
13+
INSTALL_USING_APT="${INSTALLUSINGAPT:-"true"}"
14+
15+
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
16+
UPDATE_RC="${UPDATE_RC:-"true"}"
17+
TARGET_DOTNET_ROOT="${TARGET_DOTNET_ROOT:-"/usr/local/dotnet"}"
18+
ACCESS_GROUP="${ACCESS_GROUP:-"dotnet"}"
1919

2020
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
2121
DOTNET_ARCHIVE_ARCHITECTURES="amd64"

‎src/go/install.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/go.md
88
# Maintainer: The VS Code and Codespaces Teams
99

10-
TARGET_GO_VERSION=${VERSION:-"latest"}
11-
GOLANGCILINT_VERSION=${GOLANGCILINTVERSION:-"latest"}
10+
TARGET_GO_VERSION="${VERSION:-"latest"}"
11+
GOLANGCILINT_VERSION="${GOLANGCILINTVERSION:-"latest"}"
1212

13-
TARGET_GOROOT=${TARGET_GOROOT:-"/usr/local/go"}
14-
TARGET_GOPATH=${TARGET_GOPATH:-"/go"}
15-
USERNAME=${USERNAME:-"automatic"}
16-
INSTALL_GO_TOOLS=${INSTALL_GO_TOOLS:-"true"}
13+
TARGET_GOROOT="${TARGET_GOROOT:-"/usr/local/go"}"
14+
TARGET_GOPATH="${TARGET_GOPATH:-"/go"}"
15+
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
16+
INSTALL_GO_TOOLS="${INSTALL_GO_TOOLS:-"true"}"
1717

1818
# https://www.google.com/linuxrepositories/
1919
GO_GPG_KEY_URI="https://dl.google.com/linux/linux_signing_key.pub"

‎src/hugo/install.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/hugo.md
88
# Maintainer: The VS Code and Codespaces Teams
99

10-
VERSION=${VERSION:-"latest"}
10+
VERSION="${VERSION:-"latest"}"
1111

12-
USERNAME=${USERNAME:-"automatic"}
13-
UPDATE_RC=${UPDATE_RC:-"true"}
12+
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
13+
UPDATE_RC="${UPDATE_RC:-"true"}"
1414

15-
HUGO_DIR=${HUGO_DIR:-"/usr/local/hugo"}
15+
HUGO_DIR="${HUGO_DIR:-"/usr/local/hugo"}"
1616

1717
set -e
1818

‎src/java/install.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
#
1010
# Syntax: ./java-debian.sh [JDK version] [SDKMAN_DIR] [non-root user] [Add to rc files flag]
1111

12-
JAVA_VERSION=${VERSION:-"lts"}
13-
INSTALL_GRADLE=${INSTALLGRADLE:-"false"}
14-
INSTALL_MAVEN=${INSTALLMAVEN:-"false"}
15-
JDK_DISTRO=${JDKDISTRO}
16-
17-
export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"}
18-
USERNAME=${USERNAME:-"automatic"}
19-
UPDATE_RC=${UPDATE_RC:-"true"}
12+
JAVA_VERSION="${VERSION:-"lts"}"
13+
INSTALL_GRADLE="${INSTALLGRADLE:-"false"}"
14+
INSTALL_MAVEN="${INSTALLMAVEN:-"false"}"
15+
JDK_DISTRO="${JDKDISTRO}"
16+
17+
export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}"
18+
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
19+
UPDATE_RC="${UPDATE_RC:-"true"}"
2020

2121
# Comma-separated list of java versions to be installed
2222
# alongside JAVA_VERSION, but not set as default.

0 commit comments

Comments
 (0)