add options to auto-enable userns-remap

tasks/config.yml

@@ -49,9 +49,9 @@
         state: directory
         mode: "{{ item.mode }}"
 
-    - name: Write service override
+    - name: Write service override.conf
       template:
-        src: etc/systemd/system/docker.service.d/override.j2
+        src: etc/systemd/system/docker.service.d/override.conf.j2
         dest: /etc/systemd/system/docker.service.d/override.conf
         mode: 0644
       notify: __docker_restart

templates/etc/sysconfig/docker.j2

@@ -1,4 +1,6 @@
 {{ ansible_managed | comment }}
+OPTIONS='{{' --userns-remap=' + dockerengine_nsremap_user + ':' + dockerengine_nsremap_user if dockerengine_usernamespace_enabled | bool else '' }}'
+
 # Proxy settings
 {% if dockerengine_http_proxy is defined %}
 HTTP_PROXY={{ dockerengine_http_proxy }}

templates/etc/systemd/system/docker.service.d/override.conf.j2

@@ -0,0 +1,6 @@
+[Service]
+EnvironmentFile=-/etc/sysconfig/docker
+ExecStart=
+ExecStart=/usr/bin/dockerd -H fd:// \
+    --containerd=/run/containerd/containerd.sock \
+    $OPTIONS

templates/etc/systemd/system/docker.service.d/override.j2

@@ -1,4 +0,0 @@
-[Service]
-EnvironmentFile=-/etc/sysconfig/docker
-ExecStart=
-ExecStart=/usr/bin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock