add max-file and update variable name

Author: evertramos

.env.sample

@@ -55,8 +55,22 @@ NGINX_FILES_PATH=/path/to/your/nginx/data
 #USE_NGINX_CONF_FILES=true
 
 #
-# Maximum containers logfile size
+# Docker Logging Config
 #
-NGINX_MAX_LOG_SIZE=100m
-NGINX_GEN_MAX_LOG_SIZE=25m
-NGINX_LETSENCRYPT_MAX_LOG_SIZE=25m
+# This section offers two options max-size and max-file, which follow the docker documentation
+# as follow:
+#
+# logging:
+#      driver: "json-file"
+#      options:
+#        max-size: "200k"
+#        max-file: "10" 
+#
+#NGINX_WEB_LOG_MAX_SIZE=4m
+#NGINX_WEB_LOG_MAX_FILE=10
+
+#NGINX_GEN_LOG_MAX_SIZE=2m
+#NGINX_GEN_LOG_MAX_FILE=10
+
+#NGINX_LETSENCRYPT_LOG_MAX_SIZE=2m
+#NGINX_LETSENCRYPT_LOG_MAX_FILE=10

docker-compose-multiple-networks.yml

@@ -4,59 +4,71 @@ services:
     image: nginx
     labels:
         com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
-    container_name: ${NGINX_WEB}
+    container_name: ${NGINX_WEB:-nginx-web}
     restart: always
     ports:
       - "${IP}:80:80"
       - "${IP}:443:443"
     volumes:
-      - ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
-      - ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
-      - ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
-      - ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:ro
-      - ${NGINX_FILES_PATH}/htpasswd:/etc/nginx/htpasswd:ro
+      - ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
+      - ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
+      - ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
+      - ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
+      - ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
     networks:
       - default
       - outside
+    logging:
+      options:
+        max-size: ${NGINX_WEB_LOG_MAX_SIZE:-4m}
+        max-file: ${NGINX_WEB_LOG_MAX_FILE:-10}
 
   nginx-gen:
     image: jwilder/docker-gen
-    command: -notify-sighup ${NGINX_WEB} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
-    container_name: ${DOCKER_GEN}
+    command: -notify-sighup ${NGINX_WEB:-nginx-web} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+    container_name: ${DOCKER_GEN:-nginx-gen}
     restart: always
     volumes:
-      - ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
-      - ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
-      - ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
-      - ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:ro
-      - ${NGINX_FILES_PATH}/htpasswd:/etc/nginx/htpasswd:ro
+      - ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
+      - ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
+      - ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
+      - ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
+      - ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
     networks:
       - default
       - outside
+    logging:
+      options:
+        max-size: ${NGINX_GEN_LOG_MAX_SIZE:-2m}
+        max-file: ${NGINX_GEN_LOG_MAX_FILE:-10}
 
   nginx-letsencrypt:
     image: jrcs/letsencrypt-nginx-proxy-companion
-    container_name: ${LETS_ENCRYPT}
+    container_name: ${LETS_ENCRYPT:-nginx-letsencrpt}
     restart: always
     volumes:
-      - ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
-      - ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
-      - ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
-      - ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:rw
+      - ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
+      - ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
+      - ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
+      - ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:rw
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
-      NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN}
-      NGINX_PROXY_CONTAINER: ${NGINX_WEB}
+      NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN:-nginx-gen}
+      NGINX_PROXY_CONTAINER: ${NGINX_WEB:-nginx-gen}
     networks:
       - default
       - outside
+    logging:
+      options:
+        max-size: ${NGINX_LETSENCRYPT_LOG_MAX_SIZE:-2m}
+        max-file: ${NGINX_LETSENCRYPT_LOG_MAX_FILE:-10}
 
 networks:
   default:
     external:
-      name: ${NETWORK}
+      name: ${NETWORK:-webproxy}
   outside:
     external:
       name: ${SERVICE_NETWORK}

docker-compose.yml

@@ -4,56 +4,59 @@ services:
     image: nginx
     labels:
         com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
-    container_name: ${NGINX_WEB}
+    container_name: ${NGINX_WEB:-nginx-web}
     restart: always
     ports:
       - "${IP}:80:80"
       - "${IP}:443:443"
     volumes:
-      - ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
-      - ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
-      - ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
-      - ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:ro
-      - ${NGINX_FILES_PATH}/htpasswd:/etc/nginx/htpasswd:ro
+      - ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
+      - ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
+      - ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
+      - ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
+      - ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
     logging:
       options:
-        max-size: ${NGINX_MAX_LOG_SIZE:-100m}
+        max-size: ${NGINX_WEB_LOG_MAX_SIZE:-4m}
+        max-file: ${NGINX_WEB_LOG_MAX_FILE:-10}
 
   nginx-gen:
     image: jwilder/docker-gen
-    command: -notify-sighup ${NGINX_WEB} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
-    container_name: ${DOCKER_GEN}
+    command: -notify-sighup ${NGINX_WEB:-nginx-web} -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+    container_name: ${DOCKER_GEN:-nginx-gen}
     restart: always
     volumes:
-      - ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
-      - ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
-      - ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
-      - ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:ro
-      - ${NGINX_FILES_PATH}/htpasswd:/etc/nginx/htpasswd:ro
+      - ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
+      - ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
+      - ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
+      - ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:ro
+      - ${NGINX_FILES_PATH:-data}/htpasswd:/etc/nginx/htpasswd:ro
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
     logging:
       options:
-        max-size: ${NGINX_GEN_MAX_LOG_SIZE:-25m}
+        max-size: ${NGINX_GEN_LOG_MAX_SIZE:-2m}
+        max-file: ${NGINX_GEN_LOG_MAX_FILE:-10}
 
   nginx-letsencrypt:
     image: jrcs/letsencrypt-nginx-proxy-companion
-    container_name: ${LETS_ENCRYPT}
+    container_name: ${LETS_ENCRYPT:-nginx-letsencrypt}
     restart: always
     volumes:
-      - ${NGINX_FILES_PATH}/conf.d:/etc/nginx/conf.d
-      - ${NGINX_FILES_PATH}/vhost.d:/etc/nginx/vhost.d
-      - ${NGINX_FILES_PATH}/html:/usr/share/nginx/html
-      - ${NGINX_FILES_PATH}/certs:/etc/nginx/certs:rw
+      - ${NGINX_FILES_PATH:-data}/conf.d:/etc/nginx/conf.d
+      - ${NGINX_FILES_PATH:-data}/vhost.d:/etc/nginx/vhost.d
+      - ${NGINX_FILES_PATH:-data}/html:/usr/share/nginx/html
+      - ${NGINX_FILES_PATH:-data}/certs:/etc/nginx/certs:rw
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
-      NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN}
-      NGINX_PROXY_CONTAINER: ${NGINX_WEB}
+      NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN:-nginx-gen}
+      NGINX_PROXY_CONTAINER: ${NGINX_WEB:-nginx-web}
     logging:
       options:
-        max-size: ${NGINX_LETSENCRYPT_MAX_LOG_SIZE:-25m}
+        max-size: ${NGINX_LETSENCRYPT_LOG_MAX_SIZE:-2m}
+        max-file: ${NGINX_LETSENCRYPT_LOG_MAX_FILE:-10}
 
 networks:
   default:
     external:
-      name: ${NETWORK}
+      name: ${NETWORK:-webproxy}