archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-18 13:58:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #430 from patope/master

Browse Source 
Take from resolv.conf rows beginning with 'nameserver'
This commit is contained in:
Sameer Naik 2015-09-24 22:14:17 +05:30
commit 3f8647fd16
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entrypoint.sh
View File

@ -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