Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Add docker-in-docker Azure DNS override flag #1650

Merged
merged 5 commits into from
Oct 6, 2022
Merged

Add docker-in-docker Azure DNS override flag #1650

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
329be8f
Add docker-in-docker Azure DNS override flag
kklopfenstein Oct 5, 2022
15f9df5
Merge branch 'main' into kklopfenstein/add-docker-azure-dns-flag
joshspicer Oct 6, 2022
e490791
Merge branch 'main' into kklopfenstein/add-docker-azure-dns-flag
joshspicer Oct 6, 2022
dfa495e
Resolving PR feedback
kklopfenstein Oct 6, 2022
51cdd0d
change `AZURE_DNS_OVERRIDE` to a more descriptive name
joshspicer Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions script-library/docker-in-docker-debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker-in-docker.md
# Maintainer: The VS Code and Codespaces Teams
#
# 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]
# 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]

ENABLE_NONROOT_DOCKER=${1:-"true"}
USERNAME=${2:-"automatic"}
USE_MOBY=${3:-"true"}
DOCKER_VERSION=${4:-"latest"} # The Docker/Moby Engine + CLI should match in version
DOCKER_DASH_COMPOSE_VERSION=${5:-"v1"} # v1 or v2
AZURE_DNS_AUTO_DETECTION=${6:-"true"}
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute impish jammy"
Expand Down Expand Up @@ -316,7 +317,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.
Expand All @@ -325,6 +326,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>
Expand Down Expand Up @@ -364,7 +370,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"
Expand Down Expand Up @@ -396,4 +402,4 @@ EOF
chmod +x /usr/local/share/docker-init.sh
chown ${USERNAME}:root /usr/local/share/docker-init.sh

echo 'docker-in-docker-debian script has completed!'
echo 'docker-in-docker-debian script has completed!'