Update to 2024-05-15 15:01

This commit is contained in:
Daniel Berteaud
2024-05-15 15:01:01 +02:00
parent 64de14d3d5
commit 2c684526ff
19 changed files with 108 additions and 18 deletions

View File

@@ -111,6 +111,10 @@ nomad_base_conf:
docker:
enabled: True
allow_privileged: True
disable_log_collection: False
logging:
type: json-file
config: {}
volumes:
enabled: False
# You can set a list of caps allowed for containers. The default is the same set of caps than Docker, minus net_raw
@@ -265,3 +269,4 @@ nomad_services: "{{ nomad_base_services | combine(nomad_extra_services, recursiv
# nomad_backup_token: 1677848e-1fcd-b24a-6fb0-56b503d75651
# or a more advanced use
# nomad_backup_token: $(VAULT_TOKEN=$(cat /run/vault_agent/vault.token) vault read -field=secret_id nomad/creds/admin ttl=1m)

View File

@@ -167,3 +167,4 @@
- subgid
when: nomad_conf.client.enabled and 'podman' in nomad_enabled_task_drivers
tags: nomad

View File

@@ -153,6 +153,23 @@ plugin "docker" {
auth {
config = "{{ nomad_root_dir }}/docker/auth.json"
}
{% if nomad_conf.client.task_drivers.docker.disable_log_collection %}
disable_log_collection = true
{% endif %}
logging {
type = "{{ nomad_conf.client.task_drivers.docker.logging.type }}"
config {
{% for log_conf in nomad_conf.client.task_drivers.docker.logging.config.keys() | list %}
{% if nomad_conf.client.task_drivers.docker.logging.config[log_conf] is boolean %}
{{ log_conf }} = {{ nomad_conf.client.task_drivers.docker.logging.config[log_conf] | ternary('true','false') }}
{% elif nomad_conf.client.task_drivers.docker.logging.config[log_conf] is number %}
{{ log_conf }} = {{ nomad_conf.client.task_drivers.docker.logging.config[log_conf] }}
{% else %}
{{ log_conf }} = "{{ nomad_conf.client.task_drivers.docker.logging.config[log_conf] }}"
{% endif %}
{% endfor %}
}
}
{% if nomad_conf.client.task_drivers.docker.volumes.enabled %}
volumes {
enabled = true