From 2e20f5d7d33c6b64dff68b46425b3db621511329 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Fri, 1 May 2020 17:52:56 +0700 Subject: [PATCH 1/3] added workaround for default DNS --- images/linux/scripts/installers/1804/basic.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/scripts/installers/1804/basic.sh b/images/linux/scripts/installers/1804/basic.sh index 29cb15b40..36a316f46 100644 --- a/images/linux/scripts/installers/1804/basic.sh +++ b/images/linux/scripts/installers/1804/basic.sh @@ -139,6 +139,10 @@ for cmd in curl file ftp jq netcat ssh parallel rsync shellcheck sudo telnet tim fi done +# Workaround for systemd-resolve, since sometimes stub resolver does not work properly. Details: https://github.com/actions/virtual-environments/issues/798 +echo "Create resolv.conf link." +ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf + # Document what was added to the image echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "Basic CLI:" From 28b940a0459113feec70433fa0b7dfca0d2c339d Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Tue, 5 May 2020 23:53:06 +0700 Subject: [PATCH 2/3] revert changes --- images/linux/scripts/installers/1804/basic.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/linux/scripts/installers/1804/basic.sh b/images/linux/scripts/installers/1804/basic.sh index 36a316f46..29cb15b40 100644 --- a/images/linux/scripts/installers/1804/basic.sh +++ b/images/linux/scripts/installers/1804/basic.sh @@ -139,10 +139,6 @@ for cmd in curl file ftp jq netcat ssh parallel rsync shellcheck sudo telnet tim fi done -# Workaround for systemd-resolve, since sometimes stub resolver does not work properly. Details: https://github.com/actions/virtual-environments/issues/798 -echo "Create resolv.conf link." -ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf - # Document what was added to the image echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "Basic CLI:" From 86d0fe8a93a2e4ef6153d243acefc1701a9dc61c Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Tue, 5 May 2020 23:59:05 +0700 Subject: [PATCH 3/3] workaround reverted --- images/linux/scripts/installers/1804/basic.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/linux/scripts/installers/1804/basic.sh b/images/linux/scripts/installers/1804/basic.sh index 36a316f46..29cb15b40 100644 --- a/images/linux/scripts/installers/1804/basic.sh +++ b/images/linux/scripts/installers/1804/basic.sh @@ -139,10 +139,6 @@ for cmd in curl file ftp jq netcat ssh parallel rsync shellcheck sudo telnet tim fi done -# Workaround for systemd-resolve, since sometimes stub resolver does not work properly. Details: https://github.com/actions/virtual-environments/issues/798 -echo "Create resolv.conf link." -ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf - # Document what was added to the image echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "Basic CLI:"