Skip to content

Commit 6b5b5c1

Browse files
evertramosevertramos
committed
Merge branch 'logfiles-size'
2 parents a7e389f + 77b85f1 commit 6b5b5c1

File tree

3 files changed

+86
-42
lines changed

3 files changed

+86
-42
lines changed

‎.env.sample‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,23 @@ NGINX_FILES_PATH=/path/to/your/nginx/data
5454
#
5555
#USE_NGINX_CONF_FILES=true
5656

57+
#
58+
# Docker Logging Config
59+
#
60+
# This section offers two options max-size and max-file, which follow the docker documentation
61+
# as follow:
62+
#
63+
# logging:
64+
# driver: "json-file"
65+
# options:
66+
# max-size: "200k"
67+
# max-file: "10"
68+
#
69+
#NGINX_WEB_LOG_MAX_SIZE=4m
70+
#NGINX_WEB_LOG_MAX_FILE=10
71+
72+
#NGINX_GEN_LOG_MAX_SIZE=2m
73+
#NGINX_GEN_LOG_MAX_FILE=10
74+
75+
#NGINX_LETSENCRYPT_LOG_MAX_SIZE=2m
76+
#NGINX_LETSENCRYPT_LOG_MAX_FILE=10

‎docker-compose-multiple-networks.yml‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,71 @@ services:
44
image: nginx
55
labels:
66
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
7-
container_name: ${NGINX_WEB}
7+
container_name: ${NGINX_WEB:-nginx-web}
88
restart: always
99
ports:
1010
- "${IP}:80:80"
1111
- "${IP}:443:443"
1212
volumes:
13-
- ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
14-
- ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
15-
- ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
16-
- ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:ro
17-
- ${NGINX_FILES_PATH}/htpasswd:/etc/nginx/htpasswd:ro
13+
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
14+
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
15+
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
16+
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
17+
- ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
1818
networks:
1919
- default
2020
- outside
21+
logging:
22+
options:
23+
max-size: ${NGINX_WEB_LOG_MAX_SIZE:-4m}
24+
max-file: ${NGINX_WEB_LOG_MAX_FILE:-10}
2125

2226
nginx-gen:
2327
image: jwilder/docker-gen
24-
command: -notify-sighup ${NGINX_WEB} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
25-
container_name: ${DOCKER_GEN}
28+
command: -notify-sighup ${NGINX_WEB:-nginx-web} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
29+
container_name: ${DOCKER_GEN:-nginx-gen}
2630
restart: always
2731
volumes:
28-
- ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
29-
- ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
30-
- ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
31-
- ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:ro
32-
- ${NGINX_FILES_PATH}/htpasswd:/etc/nginx/htpasswd:ro
32+
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
33+
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
34+
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
35+
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
36+
- ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
3337
- /var/run/docker.sock:/tmp/docker.sock:ro
3438
- ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
3539
networks:
3640
- default
3741
- outside
42+
logging:
43+
options:
44+
max-size: ${NGINX_GEN_LOG_MAX_SIZE:-2m}
45+
max-file: ${NGINX_GEN_LOG_MAX_FILE:-10}
3846

3947
nginx-letsencrypt:
4048
image: jrcs/letsencrypt-nginx-proxy-companion
41-
container_name: ${LETS_ENCRYPT}
49+
container_name: ${LETS_ENCRYPT:-nginx-letsencrpt}
4250
restart: always
4351
volumes:
44-
- ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
45-
- ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
46-
- ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
47-
- ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:rw
52+
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
53+
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
54+
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
55+
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:rw
4856
- /var/run/docker.sock:/var/run/docker.sock:ro
4957
environment:
50-
NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN}
51-
NGINX_PROXY_CONTAINER: ${NGINX_WEB}
58+
NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN:-nginx-gen}
59+
NGINX_PROXY_CONTAINER: ${NGINX_WEB:-nginx-gen}
5260
networks:
5361
- default
5462
- outside
63+
logging:
64+
options:
65+
max-size: ${NGINX_LETSENCRYPT_LOG_MAX_SIZE:-2m}
66+
max-file: ${NGINX_LETSENCRYPT_LOG_MAX_FILE:-10}
5567

5668
networks:
5769
default:
5870
external:
59-
name: ${NETWORK}
71+
name: ${NETWORK:-webproxy}
6072
outside:
6173
external:
6274
name: ${SERVICE_NETWORK}

‎docker-compose.yml‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,59 @@ services:
44
image: nginx
55
labels:
66
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
7-
container_name: ${NGINX_WEB}
7+
container_name: ${NGINX_WEB:-nginx-web}
88
restart: always
99
ports:
1010
- "${IP}:80:80"
1111
- "${IP}:443:443"
1212
volumes:
13-
- ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
14-
- ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
15-
- ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
16-
- ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:ro
17-
- ${NGINX_FILES_PATH}/htpasswd:/etc/nginx/htpasswd:ro
13+
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
14+
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
15+
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
16+
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
17+
- ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
18+
logging:
19+
options:
20+
max-size: ${NGINX_WEB_LOG_MAX_SIZE:-4m}
21+
max-file: ${NGINX_WEB_LOG_MAX_FILE:-10}
1822

1923
nginx-gen:
2024
image: jwilder/docker-gen
21-
command: -notify-sighup ${NGINX_WEB} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
22-
container_name: ${DOCKER_GEN}
25+
command: -notify-sighup ${NGINX_WEB:-nginx-web} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
26+
container_name: ${DOCKER_GEN:-nginx-gen}
2327
restart: always
2428
volumes:
25-
- ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
26-
- ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
27-
- ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
28-
- ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:ro
29-
- ${NGINX_FILES_PATH}/htpasswd:/etc/nginx/htpasswd:ro
29+
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
30+
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
31+
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
32+
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
33+
- ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
3034
- /var/run/docker.sock:/tmp/docker.sock:ro
3135
- ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
36+
logging:
37+
options:
38+
max-size: ${NGINX_GEN_LOG_MAX_SIZE:-2m}
39+
max-file: ${NGINX_GEN_LOG_MAX_FILE:-10}
3240

3341
nginx-letsencrypt:
3442
image: jrcs/letsencrypt-nginx-proxy-companion
35-
container_name: ${LETS_ENCRYPT}
43+
container_name: ${LETS_ENCRYPT:-nginx-letsencrypt}
3644
restart: always
3745
volumes:
38-
- ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
39-
- ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
40-
- ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
41-
- ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:rw
46+
- ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
47+
- ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
48+
- ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
49+
- ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:rw
4250
- /var/run/docker.sock:/var/run/docker.sock:ro
4351
environment:
44-
NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN}
45-
NGINX_PROXY_CONTAINER: ${NGINX_WEB}
52+
NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN:-nginx-gen}
53+
NGINX_PROXY_CONTAINER: ${NGINX_WEB:-nginx-web}
54+
logging:
55+
options:
56+
max-size: ${NGINX_LETSENCRYPT_LOG_MAX_SIZE:-2m}
57+
max-file: ${NGINX_LETSENCRYPT_LOG_MAX_FILE:-10}
4658

4759
networks:
4860
default:
4961
external:
50-
name: ${NETWORK}
62+
name: ${NETWORK:-webproxy}

0 commit comments

Comments
 (0)