From c8383b60e06c5f46bbd8254781842d4e077034fe Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Wed, 23 Nov 2022 22:21:26 +0000 Subject: Features: Set USERNAME to _REMOTE_USER if available --- src/docker-in-docker/devcontainer-feature.json | 2 +- src/docker-in-docker/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/docker-in-docker') 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..f39685f 100755 --- a/src/docker-in-docker/install.sh +++ b/src/docker-in-docker/install.sh @@ -15,7 +15,7 @@ AZURE_DNS_AUTO_DETECTION=${AZUREDNSAUTODETECTION:-"true"} DOCKER_DEFAULT_ADDRESS_POOL=${DOCKERDEFAULTADDRESSPOOL} ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"} -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" -- cgit v1.2.3