fix: k8s deployment
diff --git a/.env.example b/.env.example
index 90c30ee..714534a 100644
--- a/.env.example
+++ b/.env.example
@@ -101,12 +101,6 @@
GITHUB_PR_TITLE_PATTERN=
##########################
-# ConfigUI configuration #
-##########################
-DEVLAKE_ENDPOINT=devlake:8080
-GRAFANA_ENDPOINT=http://localhost:3002
-
-##########################
# AE (Merico-Analysis-Engine) configuration #
##########################
AE_APP_ID=
diff --git a/config-ui/nginx.conf b/config-ui/nginx.conf
index 6dfece8..d1fcfa3 100644
--- a/config-ui/nginx.conf
+++ b/config-ui/nginx.conf
@@ -10,7 +10,7 @@
}
location /api/ {
- resolver 127.0.0.11 valid=300s;
+ resolver ${DNS} valid=300s;
resolver_timeout 3s;
set $target "${DEVLAKE_ENDPOINT}";
rewrite /api/(.*) /$1 break;
diff --git a/config-ui/nginx.sh b/config-ui/nginx.sh
index a08ac36..906641f 100644
--- a/config-ui/nginx.sh
+++ b/config-ui/nginx.sh
@@ -7,7 +7,7 @@
auth_basic_user_file /etc/nginx/.htpasswd;
'
fi
-envsubst '${DEVLAKE_ENDPOINT} ${GRAFANA_ENDPOINT} ${SERVER_CONF}' \
+envsubst '${DEVLAKE_ENDPOINT} ${GRAFANA_ENDPOINT} ${SERVER_CONF} ${DNS}' \
< /etc/nginx/conf.d/default.conf.tpl \
> /etc/nginx/conf.d/default.conf
nginx -g 'daemon off;'
diff --git a/docker-compose-temporal.yml b/docker-compose-temporal.yml
index 7e79d54..c812eff 100644
--- a/docker-compose-temporal.yml
+++ b/docker-compose-temporal.yml
@@ -82,7 +82,10 @@
- 127.0.0.1:4000:80
env_file:
- ./.env
- #environment:
+ environment:
+ DNS: 127.0.0.11
+ DEVLAKE_ENDPOINT: devlake:8080
+ GRAFANA_ENDPOINT: http://localhost:3002
#ADMIN_USER: devlake
#ADMIN_PASS: merico
depends_on:
diff --git a/docker-compose.yml b/docker-compose.yml
index b45a72c..28556af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,7 +58,10 @@
- 127.0.0.1:4000:80
env_file:
- ./.env
- #environment:
+ environment:
+ DNS: 127.0.0.11
+ DEVLAKE_ENDPOINT: devlake:8080
+ GRAFANA_ENDPOINT: http://localhost:3002
#ADMIN_USER: devlake
#ADMIN_PASS: merico
depends_on:
