From 26e910573cfcbe9a658d257ed43ff4045c59b3f6 Mon Sep 17 00:00:00 2001
From: IronicBadger <alexktz@gmail.com>
Date: Mon, 20 May 2019 11:24:07 -0400
Subject: [PATCH] template fixes

---
 tasks/main.yml                  | 6 +++---
 templates/docker-compose.yml.j2 | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 3ebd47d..33a7c2a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
-- name: create destination dir for generated docker-compose.yml
+- name: create destination dir for generated readme
   file:
-    path: "{{ docker_compose_generator_output_path }}"
+    path: "{{ output_path }}"
     state: directory
 
 - name: write docker-compose file
   template:
     src: ../templates/docker-compose.yml.j2
-    dest: "{{ docker_compose_generator_output_path }}/docker-compose.yml"
+    dest: "{{ output_path }}/docker-compose.yml"
     owner: "{{ docker_compose_generator_uid }}"
     group: "{{ docker_compose_generator_gid }}"
\ No newline at end of file
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index a1dd2e3..7f1d91b 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -22,12 +22,6 @@ services:
       - {{ item }}
 {% endfor %}
 {% endif %}
-{% if item.labels is defined %}}
-    labels:
-{% for item in item.labels %}
-      - "{{ item }}"
-{% endfor %}
-{% endif %}
 {% if ( item.environment is defined ) or ( item.include_global_env_vars ) %}
     environment:
 {% if item.include_global_env_vars %}
@@ -62,6 +56,9 @@ services:
       - {{ item }}
 {% endfor %}
 {% endif %}
+{% if item.command is defined %}
+    command: {{ item.command }}
+{% endif %}
 {% if item.security_opt is defined %}
     security_opt:
 {% for item in item.security_opt %}