Fixed resolvers in nginx

Author: pomo-mondreganto

deploy/skaffold.yml

@@ -6,6 +6,8 @@ build:
       context: .
       docker:
         dockerfile: ./docker_config/services/Dockerfile
+        buildArgs:
+          DNS_RESOLVER: 127.0.0.1
     - image: forcad-initializer
       context: .
       docker:

docker-compose.yml

@@ -94,18 +94,15 @@ services:
       - SERVICE=tcp_receiver
 
   nginx:
-    image: nginx:1.17.9-alpine
+    build:
+      context: .
+      dockerfile: ./docker_config/nginx/Dockerfile
+      args:
+        DNS_RESOLVER: 127.0.0.11
     ports:
       - "8080:80"
       - "80:80"
       - "31337:31337"
-    volumes:
-      - ./docker_config/nginx/nginx.conf:/etc/nginx/nginx.conf
-      - ./docker_config/nginx/http.conf:/etc/nginx/http.conf
-      - ./docker_config/nginx/tcp.conf:/etc/nginx/tcp.conf
-      - ./docker_config/nginx/proxy_params:/etc/nginx/proxy_params
-      - ./docker_config/nginx/proxy_params_ws:/etc/nginx/proxy_params_ws
-      - ./front/dist:/var/www/front:delegated
     restart: on-failure
     depends_on:
       - flower

docker_config/nginx/Dockerfile

@@ -1,10 +1,15 @@
 FROM nginx:1.19.1-alpine
 
 COPY docker_config/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY docker_config/nginx/http.conf /etc/nginx/http.conf
-COPY docker_config/nginx/tcp.conf /etc/nginx/tcp.conf
+COPY docker_config/nginx/http.conf.template /etc/nginx/http.conf.template
+COPY docker_config/nginx/tcp.conf.template /etc/nginx/tcp.conf.template
 
 COPY docker_config/nginx/proxy_params /etc/nginx/proxy_params
 COPY docker_config/nginx/proxy_params_ws /etc/nginx/proxy_params_ws
 
 COPY front/dist /var/www/front
+
+ARG DNS_RESOLVER
+ENV DNS_RESOLVER ${DNS_RESOLVER}
+RUN envsubst '\${DNS_RESOLVER}' </etc/nginx/http.conf.template >/etc/nginx/http.conf && \
+    envsubst '\${DNS_RESOLVER}' </etc/nginx/tcp.conf.template >/etc/nginx/tcp.conf

docker_config/nginx/http.conf docker_config/nginx/http.conf.template

@@ -1,7 +1,7 @@
 limit_conn_zone $binary_remote_addr zone=http_ip_conn:16m;
 limit_req_zone $http_x_team_token zone=token_limit:64m rate=2r/s;
 
-resolver 127.0.0.11 127.0.0.1 valid=10s ipv6=off;
+resolver ${DNS_RESOLVER} valid=10s ipv6=off;
 resolver_timeout 5s;
 
 server {

docker_config/nginx/tcp.conf docker_config/nginx/tcp.conf.template

@@ -1,6 +1,6 @@
 limit_conn_zone $binary_remote_addr zone=tcp_ip_conn:16m;
 
-resolver 127.0.0.11 127.0.0.1 valid=10s ipv6=off;
+resolver ${DNS_RESOLVER} valid=10s ipv6=off;
 resolver_timeout 5s;
 
 server {