Skip to content

Commit 606d410

Browse files
committed
Properly handle the DISABLE_IPV6 environment variable.
1 parent 8e9f712 commit 606d410

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ RUN \
147147
openssl \
148148
apache2-utils \
149149
logrotate \
150+
# For /opt/nginx-proxy-manager/handle-ipv6-setting
151+
bash \
150152
# For openresty
151153
pcre \
152154
&& \
@@ -202,6 +204,7 @@ RUN \
202204
cp -r /app/backend /opt/nginx-proxy-manager && \
203205
cp -r /app/frontend/dist /opt/nginx-proxy-manager/frontend && \
204206
cp -r /app/global /opt/nginx-proxy-manager && \
207+
cp -r nginx-proxy-manager/docker/rootfs/bin/handle-ipv6-setting /opt/nginx-proxy-manager && \
205208
cp -r nginx-proxy-manager/docker/rootfs/etc/nginx /etc/ && \
206209
cp -r nginx-proxy-manager/docker/rootfs/var/www /var/ && \
207210
cp -r nginx-proxy-manager/docker/rootfs/etc/letsencrypt.ini /etc/ && \

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ fi
7070
# Generate the resolvers configuration file.
7171
echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" > /config/nginx/resolvers.conf
7272

73+
# Hnandle IPv6 settings.
74+
/opt/nginx-proxy-manager/handle-ipv6-setting /etc/nginx/conf.d
75+
/opt/nginx-proxy-manager/handle-ipv6-setting /config/nginx
76+
7377
# Take ownership of the config directory content.
7478
find /config -mindepth 1 -exec chown $USER_ID:$GROUP_ID {} \;
7579

0 commit comments

Comments
 (0)