Browse Source

Merge pull request #4147 from ashcrow/lowercase-true

Ensure true is lowercase in daemon.json
Scott Dodson 8 năm trước cách đây
mục cha
commit
f724a2cbd9

+ 1 - 0
roles/docker/tasks/systemcontainer_docker.yml

@@ -121,6 +121,7 @@
     l_docker_log_options: "{{ docker_log_options | default({}) | to_json }}"
     l_docker_additional_registries: "{{ docker_additional_registries | default([]) | to_json }}"
     l_docker_blocked_registries: "{{ docker_blocked_registries | default([]) | to_json }}"
+    l_docker_selinux_enabled: "{{ docker_selinux_enabled | default(true) | to_json }}"
 
 # Configure container-engine using the daemon.json file
 - name: Configure Container Engine

+ 2 - 2
roles/docker/templates/daemon.json

@@ -51,7 +51,7 @@
 	    "path": "/usr/libexec/docker/docker-runc-current"
 	}
     },
-    "selinux-enabled": {{ docker_selinux_enabled|default(true) }},
+    "selinux-enabled": {{ l_docker_selinux_enabled }},
     "storage-driver": "",
     "storage-opts": [],
     "tls": true,
@@ -61,6 +61,6 @@
     "tlsverify": true,
     "userns-remap": "",
     "add-registry": {{ l_docker_additional_registries }},
-    "blocked-registries": {{ l_docker_blocked_registries }},
+    "block-registries": {{ l_docker_blocked_registries }},
     "userland-proxy-path": "/usr/libexec/docker/docker-proxy-current"
 }