diff options
| author | Samruddhi Khandale <skhandale@microsoft.com> | 2022-11-24 01:21:26 +0300 |
|---|---|---|
| committer | Samruddhi Khandale <skhandale@microsoft.com> | 2022-11-24 01:21:26 +0300 |
| commit | c8383b60e06c5f46bbd8254781842d4e077034fe (patch) | |
| tree | 3cea04c37f608dd254597ef81dcef67c410cb821 /src/docker-from-docker | |
| parent | 188f1ef26bc8fa942d552dfaa8596091a8a39126 (diff) | |
Features: Set USERNAME to _REMOTE_USER if available
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 | 2 |
2 files changed, 2 insertions, 2 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..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" |