77# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker-in-docker.md
88# Maintainer: The VS Code and Codespaces Teams
99#
10- # Syntax: ./docker-in-docker-debian.sh [enable non-root docker access flag] [non-root user] [use moby] [Engine/CLI Version] [Major version for docker-compose]
10+ # Syntax: ./docker-in-docker-debian.sh [enable non-root docker access flag] [non-root user] [use moby] [Engine/CLI Version] [Major version for docker-compose] [azure DNS auto detection flag]
1111
1212ENABLE_NONROOT_DOCKER=${1:- " true" }
1313USERNAME=${2:- " automatic" }
1414USE_MOBY=${3:- " true" }
1515DOCKER_VERSION=${4:- " latest" } # The Docker/Moby Engine + CLI should match in version
1616DOCKER_DASH_COMPOSE_VERSION=${5:- " v1" } # v1 or v2
17+ AZURE_DNS_AUTO_DETECTION=${6:- " true" }
1718MICROSOFT_GPG_KEYS_URI=" https://packages.microsoft.com/keys/microsoft.asc"
1819DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES=" buster bullseye bionic focal jammy"
1920DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES=" buster bullseye bionic focal hirsute impish jammy"
@@ -316,7 +317,7 @@ if [ "${ENABLE_NONROOT_DOCKER}" = "true" ]; then
316317fi
317318
318319tee /usr/local/share/docker-init.sh > /dev/null \
319- << ' EOF '
320+ << EOF
320321#!/bin/sh
321322#-------------------------------------------------------------------------------------------------------------
322323# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -325,6 +326,11 @@ tee /usr/local/share/docker-init.sh > /dev/null \
325326
326327set -e
327328
329+ AZURE_DNS_AUTO_DETECTION=$AZURE_DNS_AUTO_DETECTION
330+ EOF
331+
332+ tee -a /usr/local/share/docker-init.sh > /dev/null \
333+ << 'EOF '
328334dockerd_start="$(cat << 'INNEREOF'
329335 # explicitly remove dockerd and containerd PID file to ensure that it can start properly if it was stopped uncleanly
330336 # ie: docker kill <ID>
@@ -364,7 +370,7 @@ dockerd_start="$(cat << 'INNEREOF'
364370 # Handle DNS
365371 set +e
366372 cat /etc/resolv.conf | grep -i 'internal.cloudapp.net'
367- if [ $? -eq 0 ]
373+ if [ $? -eq 0 ] && [ ${AZURE_DNS_AUTO_DETECTION} = "true" ]
368374 then
369375 echo "Setting dockerd Azure DNS."
370376 CUSTOMDNS="--dns 168.63.129.16"
396402chmod +x /usr/local/share/docker-init.sh
397403chown ${USERNAME} :root /usr/local/share/docker-init.sh
398404
399- echo ' docker-in-docker-debian script has completed!'
405+ echo ' docker-in-docker-debian script has completed!'
0 commit comments