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/docker-from-docker/install.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/docker-from-docker/install.sh') 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" -- cgit v1.2.3