Merge pull request #2 from ironicbadger/master

Merge upstream changes

templates/docker-compose.yml.j2

@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 ---
 version: "{{ compose_schema_version | default('2') }}"
 services:
@@ -23,13 +23,13 @@ services:
     privileged: {{ container.privileged }}
 {% endif %}
 {% if container.cap_add is defined %}
-    cap_add: 
+    cap_add:
 {% for cap in container.cap_add %}
       - {{ cap }}
 {% endfor %}
 {% endif %}
 {% if container.group_add is defined %}
-    group_add: 
+    group_add:
 {% for group in container.group_add %}
       - {{ group }}
 {% endfor %}
@@ -154,6 +154,9 @@ services:
       - {{ envfile }}
 {% endfor %}
 {% endif %}
+{% if container.user is defined %}
+    user: {{ container.user }}
+{% endif %}
 {% if container.restart is defined %}
     restart: {{ container.restart }}
 {% endif %}