summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2023-11-07 08:38:11 +0300
committerAndrew Dolgov <[email protected]>2023-11-07 08:38:11 +0300
commit61910acbcd39622f9eac4486c588b0290de524f7 (patch)
tree78ac9b090073d7332648b9cbf6f8f57dc386df4e
parentff4248b09e1bcd48bb6346df123d5de68cf20e8d (diff)
explicitly set resolver in the nginx container (configurable envvar)
-rw-r--r--.docker/web-nginx/Dockerfile3
-rw-r--r--.docker/web-nginx/nginx.conf2
2 files changed, 5 insertions, 0 deletions
diff --git a/.docker/web-nginx/Dockerfile b/.docker/web-nginx/Dockerfile
index b4dac2154..ab795dd8a 100644
--- a/.docker/web-nginx/Dockerfile
+++ b/.docker/web-nginx/Dockerfile
@@ -15,6 +15,9 @@ ENV APP_WEB_ROOT=${APP_WEB_ROOT:-/var/www/html}
# Base location for tt-rss (defaults to /tt-rss)
ENV APP_BASE=${APP_BASE:-/tt-rss}
+# Resolver for nginx (kube-dns.kube-system.svc.cluster.local for k8s)
+ENV RESOLVER=${RESOLVER:-127.0.0.11}
+
# In order to make tt-rss appear on website root without /tt-rss/ set above as follows in .env:
# APP_WEB_ROOT=/var/www/html/tt-rss
# APP_BASE=
diff --git a/.docker/web-nginx/nginx.conf b/.docker/web-nginx/nginx.conf
index 9e2298897..e3f35cd5a 100644
--- a/.docker/web-nginx/nginx.conf
+++ b/.docker/web-nginx/nginx.conf
@@ -16,6 +16,8 @@ http {
index index.php;
+ resolver ${RESOLVER} valid=5s;
+
upstream app {
server ${APP_UPSTREAM}:9000;
}