commit 04398abfb2e481c1d841353c3266d7fc7ef7956d
author Klesh Wong <zhenmian.huang@merico.dev> Fri Apr 15 00:20:22 2022 +0800
committer Klesh Wong <zhenmian.huang@merico.dev> Fri Apr 15 00:20:22 2022 +0800
tree 14756d5295cad4ef2d29080d128bda384ae73002
parent 32ce6f5343dafe2ea81c924710dc2e9cfb93f7f9

fix: dns server can not be fixed

config-ui/nginx.sh

diff --git a/config-ui/nginx.sh b/config-ui/nginx.sh
index 906641f..4f92a4e 100644
--- a/config-ui/nginx.sh
+++ b/config-ui/nginx.sh
@@ -7,6 +7,7 @@
     auth_basic_user_file /etc/nginx/.htpasswd;
     '
 fi
+export DNS=$(grep nameserver /etc/resolv.conf | awk '{print $2}')
 envsubst '${DEVLAKE_ENDPOINT} ${GRAFANA_ENDPOINT} ${SERVER_CONF} ${DNS}' \
     < /etc/nginx/conf.d/default.conf.tpl \
     > /etc/nginx/conf.d/default.conf

docker-compose-temporal.yml

diff --git a/docker-compose-temporal.yml b/docker-compose-temporal.yml
index c812eff..706cd72 100644
--- a/docker-compose-temporal.yml
+++ b/docker-compose-temporal.yml
@@ -83,7 +83,6 @@
     env_file:
       - ./.env
     environment:
-      DNS: 127.0.0.11
       DEVLAKE_ENDPOINT: devlake:8080
       GRAFANA_ENDPOINT: http://localhost:3002
       #ADMIN_USER: devlake

docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 28556af..56f0158 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,6 @@
     env_file:
       - ./.env
     environment:
-      DNS: 127.0.0.11
       DEVLAKE_ENDPOINT: devlake:8080
       GRAFANA_ENDPOINT: http://localhost:3002
       #ADMIN_USER: devlake