diff options
| -rw-r--r-- | src/docker-in-docker/devcontainer-feature.json | 4 | ||||
| -rwxr-xr-x | src/docker-in-docker/install.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json index aa6e5df..2b58470 100644 --- a/src/docker-in-docker/devcontainer-feature.json +++ b/src/docker-in-docker/devcontainer-feature.json @@ -29,10 +29,10 @@ "default": "v1", "description": "Default version of Docker Compose (v1 or v2)" }, - "azureDnsOverride": { + "azureDnsAutoDetection": { "type": "boolean", "default": true, - "description": "Override docker daemon DNS settings to use Azure DNS" + "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure" } }, "entrypoint": "/usr/local/share/docker-init.sh", diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh index a649477..afcdc1a 100755 --- a/src/docker-in-docker/install.sh +++ b/src/docker-in-docker/install.sh @@ -11,7 +11,7 @@ DOCKER_VERSION=${VERSION:-"latest"} # The Docker/Moby Engine + CLI should match in version USE_MOBY=${MOBY:-"true"} DOCKER_DASH_COMPOSE_VERSION=${DOCKERDASHCOMPOSEVERSION:-"v1"} # v1 or v2 -AZURE_DNS_OVERRIDE=${AZUREDNSOVERRIDE:-"true"} +AZURE_DNS_AUTO_DETECTION=${AZUREDNSAUTODETECTION:-"true"} ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"} USERNAME=${USERNAME:-"automatic"} @@ -322,7 +322,7 @@ tee /usr/local/share/docker-init.sh > /dev/null \ set -e -AZURE_DNS_OVERRIDE=$AZURE_DNS_OVERRIDE +AZURE_DNS_AUTO_DETECTION=$AZURE_DNS_AUTO_DETECTION EOF tee -a /usr/local/share/docker-init.sh > /dev/null \ @@ -366,7 +366,7 @@ dockerd_start="$(cat << 'INNEREOF' # Handle DNS set +e cat /etc/resolv.conf | grep -i 'internal.cloudapp.net' - if [ $? -eq 0 ] && [ ${AZURE_DNS_OVERRIDE} = "true" ] + if [ $? -eq 0 ] && [ ${AZURE_DNS_AUTO_DETECTION} = "true" ] then echo "Setting dockerd Azure DNS." CUSTOMDNS="--dns 168.63.129.16" |