Merge branch 'master' of https://github.com/LePresidente/docker-nginx-proxy-manager into crowdsec_rework

Author: LePresidente

Dockerfile

@@ -13,7 +13,7 @@ ARG DOCKER_IMAGE_VERSION=unknown
 # Define software versions.
 ARG OPENRESTY_VERSION=1.19.9.1
 ARG CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.11
-ARG NGINX_PROXY_MANAGER_VERSION=2.9.16
+ARG NGINX_PROXY_MANAGER_VERSION=2.9.18
 ARG NGINX_HTTP_GEOIP2_MODULE_VERSION=3.3
 ARG LIBMAXMINDDB_VERSION=1.5.0
 ARG WATCH_VERSION=0.3.1
@@ -238,7 +238,8 @@ RUN \
 
     # Install node-prune.
     echo "Installing node-prune..." && \
-    curl -sfL https://install.goreleaser.com/github.com/tj/node-prune.sh | bash -s -- -b /tmp/bin && \
+    mkdir /tmp/bin && \
+    curl -sfL https://gobinaries.com/tj/node-prune | PREFIX=/tmp/bin sh && \
 
     # Download the Nginx Proxy Manager package.
     echo "Downloading Nginx Proxy Manager package..." && \

appdefs.xml

@@ -109,6 +109,11 @@ Where:
     </documentation>
     <!-- Changelog of the application. -->
     <history>
+      <release>
+        <version>1.26.1</version>
+        <date>2022-06-02</date>
+        <change>Updated Nginx Proxy Manager to version 2.9.18.</change>
+      </release>
       <release>
         <version>1.26.0</version>
         <date>2022-02-22</date>

rootfs/etc/cont-init.d/nginx-proxy-manager.sh

@@ -64,7 +64,7 @@ then
 fi
 
 # Generate the resolvers configuration file.
-echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf) ipv6=off;" > /config/nginx/resolvers.conf
+echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf) ipv6=off valid=10s;" > /config/nginx/resolvers.conf
 
 # Hnandle IPv6 settings.
 /opt/nginx-proxy-manager/bin/handle-ipv6-setting /etc/nginx/conf.d