Merge "Constrain the size of Docker logs"
This commit is contained in:
commit
c47ee4fb2a
@ -92,6 +92,10 @@ docker_namespace: "kolla"
|
||||
docker_registry_username:
|
||||
docker_registry_insecure: "{{ 'yes' if docker_registry else 'no' }}"
|
||||
|
||||
# Retention settings for Docker logs
|
||||
docker_log_max_file: 5
|
||||
docker_log_max_size: 50m
|
||||
|
||||
# Valid options are [ never, on-failure, always, unless-stopped ]
|
||||
docker_restart_policy: "unless-stopped"
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
[Service]
|
||||
MountFlags=shared
|
||||
ExecStart=
|
||||
ExecStart=/usr/bin/{{ docker_binary_name|default("docker daemon", true) }}{% if docker_registry_insecure | bool %} --insecure-registry {{ docker_registry }}{% endif %}{% if docker_storage_driver %} --storage-driver {{ docker_storage_driver }}{% endif %}{% if docker_runtime_directory %} --graph {{ docker_runtime_directory }}{% endif %}{% if docker_custom_option %} {{ docker_custom_option }}{% endif %}
|
||||
ExecStart=/usr/bin/{{ docker_binary_name|default("docker daemon", true) }}{% if docker_registry_insecure | bool %} --insecure-registry {{ docker_registry }}{% endif %}{% if docker_storage_driver %} --storage-driver {{ docker_storage_driver }}{% endif %}{% if docker_runtime_directory %} --graph {{ docker_runtime_directory }}{% endif %}{% if docker_custom_option %} {{ docker_custom_option }}{% endif %} --log-opt max-file={{ docker_log_max_file }} --log-opt max-size={{ docker_log_max_size }}
|
||||
|
@ -0,0 +1,8 @@
|
||||
---
|
||||
features:
|
||||
- Docker logs are no longer allowed to grow unbounded and have
|
||||
been limited to a fixed size per container. Two new variables
|
||||
have been added, `docker_log_max_file` and `docker_log_max_size`
|
||||
which default to 5 and 50MB respectively. This means that for
|
||||
each container, there should be no more than 250MB of Docker
|
||||
logs.
|
Loading…
x
Reference in New Issue
Block a user