diff options
| author | Chuck Lantz <clantz@microsoft.com> | 2022-11-29 02:07:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-29 02:07:38 +0300 |
| commit | d1972b4d8d2dc75370c236c9dafe505ea42590f2 (patch) | |
| tree | 9bcd472a0fab51cb2c389f6527df5e51f22ec0b0 /src/docker-from-docker | |
| parent | 4af4c291225a165e5a9b0e5a65c450e81e5aecf0 (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>
Diffstat (limited to 'src/docker-from-docker')
| -rw-r--r-- | src/docker-from-docker/devcontainer-feature.json | 2 | ||||
| -rwxr-xr-x | src/docker-from-docker/install.sh | 16 |
2 files changed, 9 insertions, 9 deletions
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" |