Skip to content

Commit 1245596

Browse files
committed
fix config
1 parent e720f22 commit 1245596

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

docker-compose.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,8 @@ services:
2020
net.core.somaxconn: '2048'
2121
labels:
2222
- "Nginx Image Proxy"
23-
restart: unless-stopped
23+
restart: unless-stopped
24+
logging:
25+
options:
26+
max-size: "10m"
27+
max-file: "10"

files/etc/nginx/nginx.new

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ http {
4949

5050
log_format main '[$time_iso8601] $remote_addr - $realip_remote_addr - $remote_user - $server_name '
5151
'$host "$request" $status $body_bytes_sent "$http_referer" '
52-
'"$http_user_agent" "$http_x_forwarded_for" "upstream - $upstream_addr"';
52+
'"$http_user_agent" "$http_x_forwarded_for" "upstream - $upstream_addr"';
5353

5454

5555
access_log /var/log/nginx/access.log main;
5656

5757
# Dynamically generated resolvers file
58-
include /etc/nginx/conf.d/include/resolvers.conf;
58+
include /etc/nginx/include/resolvers.conf;
5959

6060
# Default upstream scheme
6161
map $host $forward_scheme {

files/sbin/my_init

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if [ -f /etc/nginx/nginx.new ]; then
2626
fi
2727

2828
# Dynamically generate resolvers file, if resolver is IPv6, enclose in `[]`
29-
echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf) valid=10s;" > /etc/nginx/include/resolvers.conf
29+
echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" { sub(/%.*$/,"",$2); print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf) ipv6=off valid=10s;" > /etc/nginx/include/resolvers.conf
3030

3131
echo "*** Running /root/bin/my-startup.sh..."
3232
bash /root/bin/my-startup.sh

0 commit comments

Comments
 (0)