From aab9fdbf61e1ec3c08edcda4332492bfa288f218 Mon Sep 17 00:00:00 2001 From: Tomi Pakarinen Date: Thu, 24 Sep 2015 19:26:17 +0300 Subject: [PATCH] Take rows beginning with 'nameserver' only from resolv.conf --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index b25bf6b4..b902267e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -759,7 +759,7 @@ if [[ -f /etc/nginx/sites-enabled/gitlab_ci ]]; then sed 's/{{GITLAB_HOST}}/'"${GITLAB_HOST}"'/g' -i /etc/nginx/sites-enabled/gitlab_ci sed 's/{{GITLAB_CI_HOST}}/'"${GITLAB_CI_HOST}"'/' -i /etc/nginx/sites-enabled/gitlab_ci - DNS_RESOLVERS=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2}' ORS=' ') + DNS_RESOLVERS=$(cat /etc/resolv.conf | grep '^\s*nameserver' | awk '{print $2}' ORS=' ') sed 's/{{DNS_RESOLVERS}}/'"${DNS_RESOLVERS}"'/' -i /etc/nginx/sites-enabled/gitlab_ci fi