Skip to content

Commit fcba148

Browse files
authored
Merge branch 'jlesage:master' into master
2 parents 3a31d95 + 1dba310 commit fcba148

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ARG DOCKER_IMAGE_VERSION=unknown
1212

1313
# Define software versions.
1414
ARG OPENRESTY_VERSION=1.19.9.1
15-
ARG NGINX_PROXY_MANAGER_VERSION=2.9.16
15+
ARG NGINX_PROXY_MANAGER_VERSION=2.9.18
1616
ARG NGINX_HTTP_GEOIP2_MODULE_VERSION=3.3
1717
ARG LIBMAXMINDDB_VERSION=1.5.0
1818
ARG WATCH_VERSION=0.3.1
@@ -233,7 +233,8 @@ RUN \
233233

234234
# Install node-prune.
235235
echo "Installing node-prune..." && \
236-
curl -sfL https://install.goreleaser.com/github.com/tj/node-prune.sh | bash -s -- -b /tmp/bin && \
236+
mkdir /tmp/bin && \
237+
curl -sfL https://gobinaries.com/tj/node-prune | PREFIX=/tmp/bin sh && \
237238

238239
# Download the Nginx Proxy Manager package.
239240
echo "Downloading Nginx Proxy Manager package..." && \

appdefs.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@ Where:
109109
</documentation>
110110
<!-- Changelog of the application. -->
111111
<history>
112+
<release>
113+
<version>1.26.1</version>
114+
<date>2022-06-02</date>
115+
<change>Updated Nginx Proxy Manager to version 2.9.18.</change>
116+
</release>
112117
<release>
113118
<version>1.26.0</version>
114119
<date>2022-02-22</date>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ then
6464
fi
6565

6666
# Generate the resolvers configuration file.
67-
echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" > /config/nginx/resolvers.conf
67+
echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf) valid=10s;" > /config/nginx/resolvers.conf
6868

6969
# Hnandle IPv6 settings.
7070
/opt/nginx-proxy-manager/bin/handle-ipv6-setting /etc/nginx/conf.d

0 commit comments

Comments
 (0)