|
@@ -12,7 +12,7 @@
|
|
|
"default-gateway": "",
|
|
|
"default-gateway-v6": "",
|
|
|
"default-runtime": "oci",
|
|
|
- "containerd": "/var/run/containerd.sock",
|
|
|
+ "containerd": "/run/containerd.sock",
|
|
|
"default-ulimits": {},
|
|
|
"disable-legacy-registry": false,
|
|
|
"dns": [],
|
|
@@ -26,7 +26,7 @@
|
|
|
"group": "",
|
|
|
"hosts": [],
|
|
|
"icc": false,
|
|
|
- "insecure-registries": {{ docker_insecure_registries|default([]) }},
|
|
|
+ "insecure-registries": {{ l_docker_insecure_registries }},
|
|
|
"ip": "0.0.0.0",
|
|
|
"iptables": false,
|
|
|
"ipv6": false,
|
|
@@ -36,9 +36,9 @@
|
|
|
"live-restore": true,
|
|
|
{% if docker_log_driver is defined %}
|
|
|
"log-driver": "{{ docker_log_driver }}",
|
|
|
-{% endif %}
|
|
|
+{%- endif %}
|
|
|
"log-level": "",
|
|
|
- "log-opts": {{ docker_log_options|default({}) }},
|
|
|
+ "log-opts": {{ l_docker_log_options }},
|
|
|
"max-concurrent-downloads": 3,
|
|
|
"max-concurrent-uploads": 5,
|
|
|
"mtu": 0,
|
|
@@ -60,7 +60,7 @@
|
|
|
"tlskey": "",
|
|
|
"tlsverify": true,
|
|
|
"userns-remap": "",
|
|
|
- "add-registry": {{ docker_additional_registries|default([]) }},
|
|
|
- "blocked-registries": {{ docker_blocked_registries|default([]) }},
|
|
|
+ "add-registry": {{ l_docker_additional_registries }},
|
|
|
+ "blocked-registries": {{ l_docker_blocked_registries }},
|
|
|
"userland-proxy-path": "/usr/libexec/docker/docker-proxy-current"
|
|
|
}
|