Compare commits

...

3 commits

Author SHA1 Message Date
Josh Spicer
e8627e7dd2
clarify reason for AZURE_DNS_AUTO_DETECTION variable 2022-10-06 17:31:03 +00:00
Josh Spicer
87b0685b2a
Update install.sh 2022-10-06 10:13:32 -07:00
Kevin Klopfenstein
c2628cefb1 Add docker-in-docker azure_dns_overrideflag 2022-10-06 15:41:01 +00:00
2 changed files with 13 additions and 2 deletions

View file

@ -28,6 +28,11 @@
],
"default": "v1",
"description": "Default version of Docker Compose (v1 or v2)"
},
"azureDnsAutoDetection": {
"type": "boolean",
"default": true,
"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",

View file

@ -11,6 +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_AUTO_DETECTION=${AZUREDNSAUTODETECTION:-"true"}
ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"}
USERNAME=${USERNAME:-"automatic"}
@ -312,7 +313,7 @@ if [ "${ENABLE_NONROOT_DOCKER}" = "true" ]; then
fi
tee /usr/local/share/docker-init.sh > /dev/null \
<< 'EOF'
<< EOF
#!/bin/sh
#-------------------------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
@ -321,6 +322,11 @@ tee /usr/local/share/docker-init.sh > /dev/null \
set -e
AZURE_DNS_AUTO_DETECTION=$AZURE_DNS_AUTO_DETECTION
EOF
tee -a /usr/local/share/docker-init.sh > /dev/null \
<< 'EOF'
dockerd_start="$(cat << 'INNEREOF'
# explicitly remove dockerd and containerd PID file to ensure that it can start properly if it was stopped uncleanly
# ie: docker kill <ID>
@ -360,7 +366,7 @@ dockerd_start="$(cat << 'INNEREOF'
# Handle DNS
set +e
cat /etc/resolv.conf | grep -i 'internal.cloudapp.net'
if [ $? -eq 0 ]
if [ $? -eq 0 ] && [ ${AZURE_DNS_AUTO_DETECTION} = "true" ]
then
echo "Setting dockerd Azure DNS."
CUSTOMDNS="--dns 168.63.129.16"